From 9547921445398b886f0b3866ed2f4595e19c350d Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Wed, 1 Mar 2017 15:59:55 -0500 Subject: [PATCH] [fullaot] configure.ac: pass --runtime=mobile to AOT_{BUILD,RUN}_FLAGS For the profiles where we compile the BCL with -d:MOBILE, (where the `[assembly: AssemblyVersion (Consts.FxVersion)]` attribute ends up pointing to the mobile version) make sure we AOT and run the tests using the mobile runtime. This ensures that for the framework assemblies the version number in the assembly matches the version number that the internal runtime remapping ( `mono/metadata/assembly.c` `framework_assemblies` array) --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 71f242d6fc7..0a6021c39e6 100644 --- a/configure.ac +++ b/configure.ac @@ -862,9 +862,9 @@ elif test x$with_runtime_preset = xfullaot; then mono_feature_disable_reflection_emit='yes' mono_feature_disable_appdomains='yes' - AOT_BUILD_FLAGS="-O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS" + AOT_BUILD_FLAGS="--runtime=mobile -O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS" - AOT_RUN_FLAGS="--full-aot" + AOT_RUN_FLAGS="--runtime=mobile --full-aot" elif test x$with_runtime_preset = xbitcode; then DISABLE_MCS_DOCS_default=yes with_testing_aot_full_default=yes @@ -879,15 +879,15 @@ elif test x$with_runtime_preset = xbitcode; then mono_feature_disable_reflection_emit='yes' mono_feature_disable_appdomains='yes' - AOT_BUILD_FLAGS="--aot=llvmonly,$INVARIANT_AOT_OPTIONS" - AOT_RUN_FLAGS="--llvmonly" + AOT_BUILD_FLAGS="--runtime=mobile --aot=llvmonly,$INVARIANT_AOT_OPTIONS" + AOT_RUN_FLAGS="--runtime=mobile --llvmonly" elif test x$with_runtime_preset = xhybridaot; then DISABLE_MCS_DOCS_default=yes with_testing_aot_hybrid_default=yes TEST_PROFILE=testing_aot_hybrid - AOT_BUILD_FLAGS="--aot=hybrid,$INVARIANT_AOT_OPTIONS" - AOT_RUN_FLAGS="--hybrid-aot" + AOT_BUILD_FLAGS="--runtime=mobile --aot=hybrid,$INVARIANT_AOT_OPTIONS" + AOT_RUN_FLAGS="--runtime=mobile --hybrid-aot" elif test x$with_runtime_preset = xaot; then with_profile4_x_default=yes @@ -906,8 +906,8 @@ elif test x$with_runtime_preset = xwinaot; then mono_feature_disable_reflection_emit='yes' mono_feature_disable_appdomains='yes' - AOT_BUILD_FLAGS="--aot=full,$INVARIANT_AOT_OPTIONS" - AOT_RUN_FLAGS="--full-aot" + AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS" + AOT_RUN_FLAGS="--runtime=mobile --full-aot" elif test x$with_runtime_preset = xorbis; then DISABLE_MCS_DOCS_default=yes with_orbis_default=yes @@ -919,8 +919,8 @@ elif test x$with_runtime_preset = xorbis; then mono_feature_disable_reflection_emit='yes' mono_feature_disable_appdomains='yes' - AOT_BUILD_FLAGS="--aot=full,$INVARIANT_AOT_OPTIONS" - AOT_RUN_FLAGS="--full-aot" + AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS" + AOT_RUN_FLAGS="--runtime=mobile --full-aot" else with_profile4_x_default=yes fi -- 2.11.4.GIT