diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index d7a72df2eb2..fff5a08bf11 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -12,6 +12,7 @@ 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")"
 
diff --git a/scripts/config.sh b/scripts/config.sh
index dea037e2bc0..d3c0885b3fa 100644
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -56,4 +56,3 @@ fi
 export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
 export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 
-export CG_CLIF_DISPLAY_CG_TIME=1
diff --git a/test.sh b/test.sh
index c6c4956e481..ffd795b83ef 100755
--- a/test.sh
+++ b/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-export RUSTFLAGS="-Zrun_dsymutil=no"
+export CG_CLIF_DISPLAY_CG_TIME=1
 
 ./build.sh --without-sysroot "$@"