diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index ab2bb22..294b154 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -316,12 +316,12 @@
 function run_bazel_jar() {
   local command=$1
   shift
-  local client_env=""
+  local client_env=()
   # Propagate important environment variables to bootstrapped Bazel.
-  for varname in PATH CC BAZEL_VC BAZEL_VS BAZEL_PYTHON CPLUS_INCLUDEPATH; do
+  for varname in PATH CC BAZEL_SH BAZEL_VC BAZEL_VS BAZEL_PYTHON CPLUS_INCLUDEPATH; do
     eval value=\$$varname
-    if [ ${value} ]; then
-      client_env="${client_env} --client_env=${varname}=${value}"
+    if [ "${value}" ]; then
+      client_env=("${client_env[@]}" --client_env="${varname}=${value}")
     fi
   done
 
@@ -343,7 +343,7 @@
       --ignore_unsupported_sandboxing \
       --startup_time=329 --extract_data_time=523 \
       --rc_source=/dev/null --isatty=1 \
-      ${client_env} \
+      "${client_env[@]}" \
       --client_cwd=${PWD} \
       "${@}"
 }