bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #8147 : dotdash/rust/assertion_option, r=pcwalton

Browse source 
Builds are considerably faster without assertions, so when working on
e.g. libstd, which doesn't directly interact with LLVM, one might want
to disable them.
This commit is contained in:
bors 2013-07-31 11:10:20 -07:00
commit e07e49ea8f
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
configure vendored
View file

@ -371,6 +371,7 @@ opt docs 1 "build documentation"
opt optimize 1 "build optimized rust code" opt optimize 1 "build optimized rust code"
opt optimize-cxx 1 "build optimized C++ code" opt optimize-cxx 1 "build optimized C++ code"
opt optimize-llvm 1 "build optimized LLVM" opt optimize-llvm 1 "build optimized LLVM"
opt llvm-assertions 1 "build LLVM with assertions"
opt debug 0 "build with extra debug fun" opt debug 0 "build with extra debug fun"
opt ratchet-bench 0 "ratchet benchmarks" opt ratchet-bench 0 "ratchet benchmarks"
opt fast-make 0 "use .gitmodules as timestamp for submodule deps" opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
@ -793,10 +794,17 @@ do
LLVM_DBG_OPTS="--enable-debug-symbols --disable-optimized" LLVM_DBG_OPTS="--enable-debug-symbols --disable-optimized"
# Just use LLVM straight from its build directory to # Just use LLVM straight from its build directory to
# avoid 'make install' time # avoid 'make install' time
LLVM_INST_DIR=$LLVM_BUILD_DIR/Debug+Asserts LLVM_INST_DIR=$LLVM_BUILD_DIR/Debug
else else
LLVM_DBG_OPTS="--enable-optimized" LLVM_DBG_OPTS="--enable-optimized"
LLVM_INST_DIR=$LLVM_BUILD_DIR/Release+Asserts LLVM_INST_DIR=$LLVM_BUILD_DIR/Release
fi
if [ ! -z "$CFG_DISABLE_LLVM_ASSERTIONS" ]
then
LLVM_ASSERTION_OPTS="--disable-assertions"
else
LLVM_ASSERTION_OPTS="--enable-assertions"
LLVM_INST_DIR=${LLVM_INST_DIR}+Asserts
fi fi
else else
msg "not reconfiguring LLVM, external LLVM root" msg "not reconfiguring LLVM, external LLVM root"
@ -836,7 +844,7 @@ do
LLVM_TARGET="--target=$t" LLVM_TARGET="--target=$t"
# Disable unused LLVM features # Disable unused LLVM features
LLVM_OPTS="$LLVM_DBG_OPTS --disable-docs --enable-bindings=none" LLVM_OPTS="$LLVM_DBG_OPTS $LLVM_ASSERTION_OPTS --disable-docs --enable-bindings=none"
case "$CFG_C_COMPILER" in case "$CFG_C_COMPILER" in
("ccache clang") ("ccache clang")