diff options
| author | vkargov <kargov@gmail.com> | 2017-10-31 00:28:36 +0300 |
|---|---|---|
| committer | Ludovic Henry <luhenry@microsoft.com> | 2017-10-31 00:28:36 +0300 |
| commit | 79ef4d8eef9a9de0102098eee4111feb8f426181 (patch) | |
| tree | 16bf6589538cc935fa3c337ec34f33844738d8d7 /configure.ac | |
| parent | 110888fd661f731814cc7b63be77ebd534e9b759 (diff) | |
[configure] Test AOT+LLVM if mono was configured to support both. (#5880)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index f0e97966cb4..ee1b01a18d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1064,13 +1064,6 @@ else with_profile4_x_default=yes fi -if test "x$AOT_BUILD_FLAGS" != "x"; then : - AC_SUBST(AOT_BUILD_FLAGS) - AC_SUBST(AOT_RUN_FLAGS) - # For llvmonlycheck + fullaotcheck - AC_SUBST(INVARIANT_AOT_OPTIONS) -fi - AC_SUBST(TEST_PROFILE) if test "x$with_profile4_x" = "xdefault"; then @@ -3035,6 +3028,11 @@ if test "x$enable_llvm" = "xyes"; then fi fi + if test x$with_runtime_preset != xbitcode; then + AOT_BUILD_FLAGS="$AOT_BUILD_FLAGS,llvm" + AOT_RUN_FLAGS="$AOT_RUN_FLAGS --llvm" + fi + llvm_codegen="x86codegen" case "$target" in arm*) @@ -3151,6 +3149,13 @@ if test "x$enable_llvm_runtime" = "xyes"; then fi AM_CONDITIONAL(ENABLE_LLVM_RUNTIME, [test x$enable_llvm_runtime = xyes]) +if test "x$AOT_BUILD_FLAGS" != "x"; then : + AC_SUBST(AOT_BUILD_FLAGS) + AC_SUBST(AOT_RUN_FLAGS) + # For llvmonlycheck + fullaotcheck + AC_SUBST(INVARIANT_AOT_OPTIONS) +fi + TARGET="unknown" ACCESS_UNALIGNED="yes" |