Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Lorensson <lateralusx.github@gmail.com>2019-06-04 12:16:49 +0300
committerGitHub <noreply@github.com>2019-06-04 12:16:49 +0300
commita76fc055cf1dc3173b6df1690d14723a13fbaf63 (patch)
treece6f85338a2e9edcec9b6dba2fdf77266a705fbc /configure.ac
parent4b81fcbcd7a72076cf433dd1ea3fbefd169ae95b (diff)
parent0a6b13f83a7699f29224b9e5202dfc3351f3c8de (diff)
Merge pull request #14694 from lateralusX/lateralusX/fix-llvm-build-path-msvc
Fix LLVM build break on Windows MSVC.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 30ee1d67a6b..70d82d61903 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6656,7 +6656,7 @@ fi
echo "AOT_RUN_FLAGS=$AOT_RUN_FLAGS" >> $srcdir/$mcsdir/build/config.make
echo "AOT_BUILD_ATTRS=$AOT_BUILD_ATTRS" >> $srcdir/$mcsdir/build/config.make
- if test "x$internal_llvm" != "xno"; then
+ if test "x$internal_llvm" != "xno" && test "x$enable_llvm_msvc_only" = "xno"; then
echo "AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS,$MONO_LLVM_PATH_OPTION" >> $srcdir/$mcsdir/build/config.make
else
echo "AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS" >> $srcdir/$mcsdir/build/config.make