diff options
| author | Alexander Kyte <alexmkyte@gmail.com> | 2017-06-07 21:44:16 +0300 |
|---|---|---|
| committer | Alexander Kyte <alexmkyte@gmail.com> | 2017-08-30 19:54:47 +0300 |
| commit | c872e0a100fe2474b0f5ff7993940b66493fe7a9 (patch) | |
| tree | e114b3ef8bee2866119b00945af83c439c3f938c /configure.ac | |
| parent | 2c71963d23319bfaf71c7c80db42baf5ffdbdf8e (diff) | |
[runtime] Fix in-tree building for mkbundle
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 ba174a27c1a..8ab69e90472 100644 --- a/configure.ac +++ b/configure.ac @@ -864,6 +864,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 @@ -890,8 +892,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 @@ -908,6 +910,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 @@ -935,6 +938,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 @@ -948,6 +952,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 @@ -4751,6 +4756,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 |