diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-01 19:47:14 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-01 19:47:14 +0100 |
| commit | 1ea618a7b68bc434d4ff8514fbb6edf483efe9e9 (patch) | |
| tree | cd269abe0b86819082ba037ceb8a30f8c9cb8b68 | |
| parent | cb367602ff7878b02e91bac72178e70b305dda85 (diff) | |
| download | rust-1ea618a7b68bc434d4ff8514fbb6edf483efe9e9.tar.gz rust-1ea618a7b68bc434d4ff8514fbb6edf483efe9e9.zip | |
Make it easier to use build_sysroot.sh
| -rwxr-xr-x | build_sysroot/build_sysroot.sh | 6 | ||||
| -rwxr-xr-x | test.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh index 2b2208fc8e5..7557f74b286 100755 --- a/build_sysroot/build_sysroot.sh +++ b/build_sysroot/build_sysroot.sh @@ -5,6 +5,10 @@ set -e cd $(dirname "$0") +if [ -z $CHANNEL ]; then +export CHANNEL='release' +fi + pushd ../ >/dev/null source ./scripts/config.sh popd >/dev/null @@ -24,7 +28,7 @@ export RUSTFLAGS=$RUSTFLAGS" --clif" # Build libs export RUSTFLAGS="$RUSTFLAGS -Zforce-unstable-if-unmarked -Cpanic=abort" -if [[ "$1" == "--release" ]]; then +if [[ "$1" != "--debug" ]]; then sysroot_channel='release' # FIXME Enable incremental again once rust-lang/rust#74946 is fixed # FIXME Enable -Zmir-opt-level=2 again once it doesn't ice anymore diff --git a/test.sh b/test.sh index c62ee8716bc..e7a0d6ab4e1 100755 --- a/test.sh +++ b/test.sh @@ -22,7 +22,7 @@ rm -r target/out || true no_sysroot_tests echo "[BUILD] sysroot" -time ./build_sysroot/build_sysroot.sh --release +time ./build_sysroot/build_sysroot.sh base_sysroot_tests |