Move some env var definitions around to fix cross-compilation

build.sh

@@ -64,7 +64,6 @@ fi
 
 if [[ "$build_sysroot" == "1" ]]; then
     echo "[BUILD] sysroot"
-    export CG_CLIF_INCR_CACHE_DISABLED=1
     dir=$(pwd)
     cd "$target_dir"
     time "$dir/build_sysroot/build_sysroot.sh"

build_sysroot/build_sysroot.sh

@@ -12,7 +12,6 @@ dir=$(pwd)
 # build scripts are still compiled using cg_llvm.
 export RUSTC=$dir"/bin/cg_clif_build_sysroot"
 export RUSTFLAGS=$RUSTFLAGS" --clif"
-export CG_CLIF_DISPLAY_CG_TIME=1
 
 cd "$(dirname "$0")"
 

scripts/ext_config.sh

@@ -5,6 +5,7 @@
 set -e
 
 export CG_CLIF_DISPLAY_CG_TIME=1
+export CG_CLIF_INCR_CACHE_DISABLED=1
 
 export HOST_TRIPLE=$(rustc -vV | grep host | cut -d: -f2 | tr -d " ")
 export TARGET_TRIPLE=${TARGET_TRIPLE:-$HOST_TRIPLE}

scripts/tests.sh

@@ -3,7 +3,7 @@
 set -e
 
 source build/config.sh
-export CG_CLIF_INCR_CACHE_DISABLED=1
+source scripts/ext_config.sh
 MY_RUSTC="$RUSTC $RUSTFLAGS -L crate=target/out --out-dir target/out -Cdebuginfo=2"
 
 function no_sysroot_tests() {

test.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 set -e
 
-source scripts/ext_config.sh
-
 ./build.sh --without-sysroot "$@"
 
 rm -r target/out || true