OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable LLVM assertions on Nightly, enable them in "alt" builds.

This commit is contained in:
Simon Sapin 2017-11-06 18:57:51 +01:00
parent 74be072068
commit 325a769a21
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/config.rs
View File

@ -528,7 +528,7 @@ impl Config {
// Now that we've reached the end of our configuration, infer the
// default values for all options that we haven't otherwise stored yet.
let default = config.channel == "nightly";
let default = false;
config.llvm_assertions = llvm_assertions.unwrap_or(default);
let default = match &config.channel[..] {

2
src/ci/run.sh
View File

@ -49,7 +49,7 @@ if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
elif [ "$DEPLOY_ALT" != "" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions"
fi
else
# We almost always want debug assertions enabled, but sometimes this takes too