diff options
author | Aleksey Kliger <aleksey@xamarin.com> | 2017-04-27 02:36:59 +0300 |
---|---|---|
committer | Aleksey Kliger <aleksey@xamarin.com> | 2017-04-27 02:38:34 +0300 |
commit | 9e967f00b3073671b340c1a4e3da7253d5213668 (patch) | |
tree | 8c0f71e3377de7dd9db3f09985531f4ef92869b1 /configure.ac | |
parent | 8532b7d59b0b9107d25bd2ad6d21cc9d30e48c80 (diff) |
[loader] Rename enable-minimal=assembly_remapping to desktop_loader
Use a single DISABLE_DESKTOP_LOADER define instead of
DISABLE_ASSEMBLY_REMAPPING and DISABLE_STRICT_STRONG_NAMES
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 56e56c147e9..8be5513adce 100644 --- a/configure.ac +++ b/configure.ac @@ -1049,7 +1049,7 @@ fi AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems. LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier, - reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting, + reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting, security, lldb, mdb, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.], [ for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do @@ -1170,11 +1170,10 @@ if test "x$mono_feature_disable_normalization" = "xyes"; then AC_MSG_NOTICE([Disabled String normalization support.]) fi -if test "x$mono_feature_disable_assembly_remapping" = "xyes"; then - AC_DEFINE(DISABLE_ASSEMBLY_REMAPPING, 1, [Disable assembly remapping.]) - AC_MSG_NOTICE([Disabled Assembly remapping.]) - AC_DEFINE(DISABLE_STRICT_STRONG_NAMES, 1, [Disable strict strong name checking.]) - AC_MSG_NOTICE([Disabled strict strong name checking.]) +#TODO: remove assembly_remapping feature name once everyone is using desktop_loader +if test "x$mono_feature_disable_assembly_remapping" = "xyes" || "x$mono_feature_disable_desktop_loader" = "xyes"; then + AC_DEFINE(DISABLE_DESKTOP_LOADER, 1, [Disable desktop assembly loader semantics.]) + AC_MSG_NOTICE([Disabled desktop assembly loader semantics.]) fi if test "x$mono_feature_disable_shared_perfcounters" = "xyes"; then |