bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make it easier to use build_sysroot.sh

Browse source
This commit is contained in:
bjorn3 2020-11-01 19:47:14 +01:00
parent cb367602ff
commit 1ea618a7b6
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build_sysroot/build_sysroot.sh
View file

@ -5,6 +5,10 @@
set -e set -e
cd $(dirname "$0") cd $(dirname "$0")
if [ -z $CHANNEL ]; then
export CHANNEL='release'
fi
pushd ../ >/dev/null pushd ../ >/dev/null
source ./scripts/config.sh source ./scripts/config.sh
popd >/dev/null popd >/dev/null
@ -24,7 +28,7 @@ export RUSTFLAGS=$RUSTFLAGS" --clif"
# Build libs # Build libs
export RUSTFLAGS="$RUSTFLAGS -Zforce-unstable-if-unmarked -Cpanic=abort" export RUSTFLAGS="$RUSTFLAGS -Zforce-unstable-if-unmarked -Cpanic=abort"
if [[ "$1" == "--release" ]]; then if [[ "$1" != "--debug" ]]; then
sysroot_channel='release' sysroot_channel='release'
# FIXME Enable incremental again once rust-lang/rust#74946 is fixed # FIXME Enable incremental again once rust-lang/rust#74946 is fixed
# FIXME Enable -Zmir-opt-level=2 again once it doesn't ice anymore # FIXME Enable -Zmir-opt-level=2 again once it doesn't ice anymore

2
test.sh
View file

@ -22,7 +22,7 @@ rm -r target/out || true
no_sysroot_tests no_sysroot_tests
echo "[BUILD] sysroot" echo "[BUILD] sysroot"
time ./build_sysroot/build_sysroot.sh --release time ./build_sysroot/build_sysroot.sh
base_sysroot_tests base_sysroot_tests