diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-11-06 18:57:51 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-11-11 23:31:37 +0100 |
| commit | 325a769a21b38d9e467e5629d3a5bbf16ca5ed1f (patch) | |
| tree | aac92639cc79b0089226dc82aea20943da1031d6 | |
| parent | 74be072068737ae3ef30be66e34c1569cf652652 (diff) | |
| download | rust-325a769a21b38d9e467e5629d3a5bbf16ca5ed1f.tar.gz rust-325a769a21b38d9e467e5629d3a5bbf16ca5ed1f.zip | |
Disable LLVM assertions on Nightly, enable them in "alt" builds.
| -rw-r--r-- | src/bootstrap/config.rs | 2 | ||||
| -rwxr-xr-x | 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 33c7141e704..35e62f17f2e 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 b4fa033c4a6..deea4fec4dc 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 |