diff --git a/build.sh b/build.sh
index 26041b59cca..48fb5819a19 100755
--- a/build.sh
+++ b/build.sh
@@ -57,4 +57,5 @@ if [[ "$build_sysroot" == "1" ]]; then
     dir=$(pwd)
     cd "$target_dir"
     time "$dir/build_sysroot/build_sysroot.sh"
+    cp lib/rustlib/*/lib/libstd-* lib/
 fi
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index fff5a08bf11..3d0a94ad3cb 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -25,6 +25,7 @@ export CARGO_TARGET_DIR=target
 
 # Build libs
 export RUSTFLAGS="$RUSTFLAGS -Zforce-unstable-if-unmarked -Cpanic=abort"
+export __CARGO_DEFAULT_LIB_METADATA="cg_clif"
 if [[ "$1" != "--debug" ]]; then
     sysroot_channel='release'
     # FIXME Enable incremental again once rust-lang/rust#74946 is fixed
diff --git a/scripts/config.sh b/scripts/config.sh
index d3c0885b3fa..fe6d86ea6b4 100644
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -53,6 +53,6 @@ if [[ $(uname) == 'Darwin' ]]; then
    export RUSTFLAGS="$RUSTFLAGS -Clink-arg=-undefined -Clink-arg=dynamic_lookup"
 fi
 
-export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
+export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib:"$dir"/lib"
 export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH