diff options
| author | Alexander Kyte <alexmkyte@gmail.com> | 2017-11-15 17:56:26 +0300 |
|---|---|---|
| committer | Ludovic Henry <luhenry@microsoft.com> | 2017-11-15 17:56:26 +0300 |
| commit | ca8b8bd346a66b5a5a7bd1b5410421588f5af599 (patch) | |
| tree | 6ae5847766371fae146b1784d4dfda3fa26d43b7 /configure.ac | |
| parent | 50fa04c1365f68f309c6d0613c96672deb0d07fc (diff) | |
[runtime] Add Dedup Support to MkBundle (#5484)
* [runtime] Fix mkbundle compilation on OSX
* [runtime] Add aot arguments to mkbundle
* [runtime] Enable compiling aot with mkbundle
* [runtime] Add new dedup interface to mkbundle
* [runtime] Fix path resolving for mkbundle
* [runtime] Use mkbundle in BCL tests
* [runtime] Skip building System.Security, System.IdentityModel tests on testing_aot_full
* [runtime] Fix in-tree building for mkbundle
* [runtime] Move testing dll into profile
* [runtime] Add target to mkbundle all tests before CI
* [runtime] Build stripper and use with mkbundle
Preliminary linker support ran into dependency-finding bug
with the monolinker.exe binary. Fix postponed until later.
* [runtime] Skip not supported tests with mkbundle
* [runtime] Don't re-aot when running BCL tests
* [runtime] Provide config to mkbundle
* [runtime] Fix mkbundle internationalization test results, build all
* [runtime] Clean up temp mkbundle aot directory
* [runtime] Add mkbundle support for dedup
* [runtime] Fix tracking of dedup module in mkbundle
* [runtime] Document mkbundle AOT options in man pages
* [runtime] Fix CADMessage generic method argument marshalling
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 66ed8b5e5a3..8c4059648f9 100644 --- a/configure.ac +++ b/configure.ac @@ -958,6 +958,8 @@ with_cooperative_gc_default=no INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=8000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4000 +AOT_BUILD_ATTRS=$INVARIANT_AOT_OPTIONS + if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then DISABLE_MCS_DOCS_default=yes elif test x$with_runtime_preset = xnet_4_x; then @@ -985,8 +987,8 @@ elif test x$with_runtime_preset = xfullaot; then mono_feature_disable_appdomains='yes' AOT_BUILD_FLAGS="--runtime=mobile -O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS" - AOT_RUN_FLAGS="--runtime=mobile --full-aot" + AOT_MODE="full" elif test x$with_runtime_preset = xbitcode; then DISABLE_MCS_DOCS_default=yes with_testing_aot_full_default=yes @@ -1003,6 +1005,7 @@ elif test x$with_runtime_preset = xbitcode; then AOT_BUILD_FLAGS="--runtime=mobile --aot=llvmonly,$INVARIANT_AOT_OPTIONS" AOT_RUN_FLAGS="--runtime=mobile --llvmonly" + AOT_MODE="llvmonly" elif test x$with_runtime_preset = xhybridaot; then DISABLE_MCS_DOCS_default=yes with_testing_aot_hybrid_default=yes @@ -1030,6 +1033,7 @@ elif test x$with_runtime_preset = xwinaot; then AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS" AOT_RUN_FLAGS="--runtime=mobile --full-aot" + AOT_MODE="llvmonly" elif test x$with_runtime_preset = xorbis; then DISABLE_MCS_DOCS_default=yes with_orbis_default=yes @@ -1043,6 +1047,7 @@ elif test x$with_runtime_preset = xorbis; then AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS" AOT_RUN_FLAGS="--runtime=mobile --full-aot" + AOT_MODE="full" elif test x$with_runtime_preset = xunreal; then DISABLE_MCS_DOCS_default=yes with_unreal_default=yes @@ -4871,6 +4876,11 @@ fi if test "x$AOT_BUILD_FLAGS" != "x" ; then echo "AOT_RUN_FLAGS=$AOT_RUN_FLAGS" >> $srcdir/$mcsdir/build/config.make echo "AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS" >> $srcdir/$mcsdir/build/config.make + echo "AOT_BUILD_ATTRS=$AOT_BUILD_ATTRS" >> $srcdir/$mcsdir/build/config.make + fi + + if test "x$AOT_MODE" != "x" ; then + echo "AOT_MODE=$AOT_MODE" >> $srcdir/$mcsdir/build/config.make fi if test "x$enable_btls" = "xyes"; then |