about summary refs log tree commit diff
path: root/build_sysroot
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2020-10-05 11:12:41 +0200
committerbjorn3 <bjorn3@users.noreply.github.com>2020-10-05 11:12:41 +0200
commit3fc673d0a9f6065c7b1f6178426c60082b74f408 (patch)
treed5c5edcc18a35314ea644c83ee290aa91db835fc /build_sysroot
parentab92638735b1902f7421b94d93826ac6921b9c10 (diff)
downloadrust-3fc673d0a9f6065c7b1f6178426c60082b74f408.tar.gz
rust-3fc673d0a9f6065c7b1f6178426c60082b74f408.zip
Rustup to rustc 1.49.0-nightly (beb5ae474 2020-10-04)
Diffstat (limited to 'build_sysroot')
-rwxr-xr-xbuild_sysroot/build_sysroot.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index 2f09453e0f7..930f3054b03 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -24,7 +24,8 @@ export RUSTFLAGS="$RUSTFLAGS -Zforce-unstable-if-unmarked -Cpanic=abort"
 if [[ "$1" == "--release" ]]; then
     sysroot_channel='release'
     # FIXME Enable incremental again once rust-lang/rust#74946 is fixed
-    CARGO_INCREMENTAL=0 RUSTFLAGS="$RUSTFLAGS -Zmir-opt-level=2" cargo build --target $TARGET_TRIPLE --release
+    # FIXME Enable -Zmir-opt-level=2 again once it doesn't ice anymore
+    CARGO_INCREMENTAL=0 RUSTFLAGS="$RUSTFLAGS" cargo build --target $TARGET_TRIPLE --release
 else
     sysroot_channel='debug'
     cargo build --target $TARGET_TRIPLE