commit bcbdb87bb8ee131fbd9631b84b4112843422915f
author Nicolas Lopez <ngiraldo@google.com> Tue Mar 28 08:08:50 2017 +0000
committer Philipp Wollermann <philwo@google.com> Tue Mar 28 19:50:12 2017 +0000
tree 9b3e74071b54dbe6f21a20e95d9750172589dc45
parent 70a8d3580b3c04b7e72fec9412e1d61b1e478020

Replacing hardcoded use of 'local' for env variables in cc autoconfig

--
Change-Id: Ic1632229e67bf82b69983f9614258c5fd54c12d8
Reviewed-on: https://cr.bazel.build/9390
PiperOrigin-RevId: 151422502
MOS_MIGRATED_REVID=151422502

scripts/bootstrap/compile.sh

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index becd458..1a46712 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -324,7 +324,22 @@
   shift
   local client_env=()
   # Propagate important environment variables to bootstrapped Bazel.
-  for varname in PATH CC BAZEL_SH BAZEL_VC BAZEL_VS BAZEL_PYTHON CPLUS_INCLUDEPATH; do
+  local env_vars="ABI_LIBC_VERSION"
+  env_vars="$env_vars ABI_VERSION"
+  env_vars="$env_vars BAZEL_COMPILER "
+  env_vars="$env_vars BAZEL_HOST_SYSTEM"
+  env_vars="$env_vars BAZEL_PYTHON"
+  env_vars="$env_vars BAZEL_SH"
+  env_vars="$env_vars BAZEL_TARGET_CPU"
+  env_vars="$env_vars BAZEL_TARGET_LIBC"
+  env_vars="$env_vars BAZEL_TARGET_SYSTEM"
+  env_vars="$env_vars BAZEL_VC"
+  env_vars="$env_vars BAZEL_VS"
+  env_vars="$env_vars CC"
+  env_vars="$env_vars CC_TOOLCHAIN_NAME"
+  env_vars="$env_vars CPLUS_INCLUDE_PATH"
+  env_vars="$env_vars PATH"
+  for varname in $env_vars; do
     eval value=\$$varname
     if [ "${value}" ]; then
       client_env=("${client_env[@]}" --client_env="${varname}=${value}")