diff options
| author | bors <bors@rust-lang.org> | 2017-11-13 11:46:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-13 11:46:55 +0000 |
| commit | b7ccb0a5a7ee5bf51dbb63490c0d7166cfb993e2 (patch) | |
| tree | 60993f81e5c4a7567ae16747951dd74f5915110f /src/ci | |
| parent | e312c8a8c3ecd7fead1e8a6cc591360dc73c9e79 (diff) | |
| parent | 7625c79f2a8947388012d0636cac914c47771eff (diff) | |
| download | rust-b7ccb0a5a7ee5bf51dbb63490c0d7166cfb993e2.tar.gz rust-b7ccb0a5a7ee5bf51dbb63490c0d7166cfb993e2.zip | |
Auto merge of #45810 - SimonSapin:ac-dc, r=aturon
Disable LLVM assertions on Nightly, enable them in "alt" builds. Per IRC discussion https://mozilla.logbot.info/rust-infra/20171106#c13812170-c13812204 Background: https://internals.rust-lang.org/t/disabling-llvm-assertions-in-nightly-builds/5388/14
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |