diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh
index 8e0d40e7..6d466ad7 100755
--- a/scripts/build-toolchains.sh
+++ b/scripts/build-toolchains.sh
@@ -135,13 +135,14 @@ fi
 
 cd "$RDIR"
 
-echo "export CHIPYARD_TOOLCHAIN_SOURCED=1" > env.sh
-echo "export RISCV=$RISCV" >> env.sh
-echo "export PATH=$RISCV/bin:$RDIR/$DTCversion:\$PATH" >> env.sh
-echo "export LD_LIBRARY_PATH=$RISCV/lib\${LD_LIBRARY_PATH:+":${LD_LIBRARY_PATH}"}" >> env.sh
+{
+    echo "export CHIPYARD_TOOLCHAIN_SOURCED=1"
+    echo "export RISCV=$(printf '%q' "$RISCV")"
+    echo "export PATH=\${RISCV}/bin:\${PATH}"
+    echo "export LD_LIBRARY_PATH=\${RISCV}/lib\${LD_LIBRARY_PATH:+":\${LD_LIBRARY_PATH}"}"
+} > env.sh
 echo "Toolchain Build Complete!"
 
-
 if [ "$FASTINSTALL" = "false" ]; then
     # commands that can't run on EC2 (specifically, OpenOCD because of autoconf version_
     # see if the instance info page exists. if not, we are not on ec2.