about summary refs log tree commit diff
path: root/build_sysroot
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2020-10-10 16:41:31 +0200
committerbjorn3 <bjorn3@users.noreply.github.com>2020-10-10 16:41:31 +0200
commitfaec12461f34db4145000a891c4ee5df2e8d4132 (patch)
treee5319be8db9e4b7497e076dc0c431c9a02ead321 /build_sysroot
parentc352f91b40a3533d49cc1c1ef58f9e656409cce5 (diff)
downloadrust-faec12461f34db4145000a891c4ee5df2e8d4132.tar.gz
rust-faec12461f34db4145000a891c4ee5df2e8d4132.zip
Use custom driver for sysroot building too
This required another custom driver to ensure that build scripts are
built using cg_llvm instead of cg_clif.

After this change only rustdoc still uses -Zcodegen-backend
Diffstat (limited to 'build_sysroot')
-rwxr-xr-xbuild_sysroot/build_sysroot.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index 930f3054b03..04c82ca2a51 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -16,8 +16,8 @@ rm -r sysroot/ 2>/dev/null || true
 
 # Use rustc with cg_clif as hotpluggable backend instead of the custom cg_clif driver so that
 # build scripts are still compiled using cg_llvm.
-export RUSTC=rustc
-export RUSTFLAGS=$RUSTFLAGS" -Ztrim-diagnostic-paths=no -Zcodegen-backend=$(pwd)/../target/"$CHANNEL"/librustc_codegen_cranelift."$dylib_ext" --sysroot $(pwd)/sysroot"
+export RUSTC=$(pwd)/../"target/"$CHANNEL"/cg_clif_build_sysroot"
+export RUSTFLAGS=$RUSTFLAGS" --clif"
 
 # Build libs
 export RUSTFLAGS="$RUSTFLAGS -Zforce-unstable-if-unmarked -Cpanic=abort"