mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
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
23
configure
vendored
23
configure
vendored
@ -1307,6 +1307,12 @@ CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/
|
||||
for t in $CFG_HOST
|
||||
do
|
||||
do_reconfigure=1
|
||||
is_msvc=0
|
||||
case "$t" in
|
||||
(*-msvc)
|
||||
is_msvc=1
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -z $CFG_LLVM_ROOT ]
|
||||
then
|
||||
@ -1326,8 +1332,14 @@ do
|
||||
LLVM_ASSERTION_OPTS="--disable-assertions"
|
||||
else
|
||||
LLVM_ASSERTION_OPTS="--enable-assertions"
|
||||
|
||||
# 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
|
||||
else
|
||||
msg "not reconfiguring LLVM, external LLVM root"
|
||||
# The user is using their own LLVM
|
||||
@ -1356,14 +1368,7 @@ do
|
||||
done
|
||||
fi
|
||||
|
||||
use_cmake=0
|
||||
case "$t" in
|
||||
(*-msvc)
|
||||
use_cmake=1
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ ${do_reconfigure} -ne 0 ] && [ ${use_cmake} -ne 0 ]
|
||||
if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -ne 0 ]
|
||||
then
|
||||
msg "configuring LLVM for $t with cmake"
|
||||
|
||||
@ -1388,7 +1393,7 @@ do
|
||||
need_ok "LLVM cmake configure failed"
|
||||
fi
|
||||
|
||||
if [ ${do_reconfigure} -ne 0 ] && [ ${use_cmake} -eq 0 ]
|
||||
if [ ${do_reconfigure} -ne 0 ] && [ ${is_msvc} -eq 0 ]
|
||||
then
|
||||
# LLVM's configure doesn't recognize the new Windows triples yet
|
||||
gnu_t=$(to_gnu_triple $t)
|
||||
|
Loading…
Reference in New Issue
Block a user