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:
authorlateralusX <lateralusx.github@gmail.com>2019-05-29 13:09:59 +0300
committerlateralusX <lateralusx.github@gmail.com>2019-05-29 13:09:59 +0300
commit0a6b13f83a7699f29224b9e5202dfc3351f3c8de (patch)
tree1da762677d37ad2ec102481650959f441da4cd9a /configure.ac
parent472465d6ba26d5cb9f98b2cad4b929e23adf2239 (diff)
Fix LLVM build break on Windows MSVC.
https://github.com/mono/mono/pull/14607 broke LLVM build on Windows MSVC. This is just a quick fix falling back to old behavior on Windows MSVC. Since all LLVM tools will be available in the same folder as mono runtime binary there is no specific need to point out other build folders hosting LLVM tooling.
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 d5c8ecc09c7..58d9d030963 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