From 8ed81c060c05f441ad8b0d8c543e0b4a98f8bf00 Mon Sep 17 00:00:00 2001
From: Vladimir Kargov <kargov@gmail.com>
Date: Wed, 1 Nov 2017 12:18:28 -0700
Subject: [PATCH] Revert "[configure] Test AOT+LLVM if mono was configured to
 support both. (#5880)"

This reverts commit 79ef4d8eef9a9de0102098eee4111feb8f426181.
---
 configure.ac | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 945c1e105a2..11635c04267 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1064,6 +1064,13 @@ 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
@@ -3034,11 +3041,6 @@ 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*)
@@ -3155,13 +3157,6 @@ 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"
 
-- 
2.11.4.GIT