configure: Fix LLVM output dir on MSVC
If LLVM assertions are enabled for MSVC, it looks like the output directory is still just `Release` (or assertions are just always ignored on MSVC).
This commit is contained in:
parent
b70f49b86f
commit
3d74fbd496
1 changed files with 15 additions and 10 deletions
25
configure
vendored
25
configure
vendored
|
@ -1307,6 +1307,12 @@ CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/
|
||||||
for t in $CFG_HOST
|
for t in $CFG_HOST
|
||||||
do
|
do
|
||||||
do_reconfigure=1
|
do_reconfigure=1
|
||||||
|
is_msvc=0
|
||||||
|
case "$t" in
|
||||||
|
(*-msvc)
|
||||||
|
is_msvc=1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
if [ -z $CFG_LLVM_ROOT ]
|
if [ -z $CFG_LLVM_ROOT ]
|
||||||
then
|
then
|
||||||
|
@ -1326,7 +1332,13 @@ do
|
||||||
LLVM_ASSERTION_OPTS="--disable-assertions"
|
LLVM_ASSERTION_OPTS="--disable-assertions"
|
||||||
else
|
else
|
||||||
LLVM_ASSERTION_OPTS="--enable-assertions"
|
LLVM_ASSERTION_OPTS="--enable-assertions"
|
||||||
LLVM_INST_DIR=${LLVM_INST_DIR}+Asserts
|
|
||||||
|
# Apparently even if we request assertions be enabled for MSVC,
|
||||||
|
# LLVM's CMake build system ignore this and outputs in `Release`
|
||||||
|
# anyway.
|
||||||
|
if [ ${is_msvc} -eq 0 ]; then
|
||||||
|
LLVM_INST_DIR=${LLVM_INST_DIR}+Asserts
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
msg "not reconfiguring LLVM, external LLVM root"
|
msg "not reconfiguring LLVM, external LLVM root"
|
||||||
|
@ -1356,14 +1368,7 @@ do
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
use_cmake=0
|
if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -ne 0 ]
|
||||||
case "$t" in
|
|
||||||
(*-msvc)
|
|
||||||
use_cmake=1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ ${do_reconfigure} -ne 0 ] && [ ${use_cmake} -ne 0 ]
|
|
||||||
then
|
then
|
||||||
msg "configuring LLVM for $t with cmake"
|
msg "configuring LLVM for $t with cmake"
|
||||||
|
|
||||||
|
@ -1388,7 +1393,7 @@ do
|
||||||
need_ok "LLVM cmake configure failed"
|
need_ok "LLVM cmake configure failed"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ${do_reconfigure} -ne 0 ] && [ ${use_cmake} -eq 0 ]
|
if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -eq 0 ]
|
||||||
then
|
then
|
||||||
# LLVM's configure doesn't recognize the new Windows triples yet
|
# LLVM's configure doesn't recognize the new Windows triples yet
|
||||||
gnu_t=$(to_gnu_triple $t)
|
gnu_t=$(to_gnu_triple $t)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue