From eac34c9a754b3e05746017fbc84b23a05a5633ac Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 6 Nov 2017 18:57:51 +0100 Subject: [PATCH] Disable LLVM assertions on Nigthly, enable them in "alt" builds. --- src/bootstrap/config.rs | 2 +- src/ci/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 33c7141e7044a..35e62f17f2e07 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -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[..] { diff --git a/src/ci/run.sh b/src/ci/run.sh index b4fa033c4a668..deea4fec4dcfb 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -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