Env.vars: server won't ignore the client env

Make the --ignore_client_env flag a no-op.
The client will pass --client_env flags to the
server even in --batch mode. This simplifies the
code as well as ensuring that the server always
uses the up-do-date client environment.

We'll gradually get rid of all System.getenv calls
in the server, because the server should always
respect the client env.

Roll forward of 149403129 with fixes.

--
PiperOrigin-RevId: 149435060
MOS_MIGRATED_REVID=149435060

1 files changed, 10 insertions, 1 deletions

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index dee6ce2b5b..ab2bb22719 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -316,6 +316,15 @@ fi
 function run_bazel_jar() {
   local command=$1
   shift
+  local client_env=""
+  # Propagate important environment variables to bootstrapped Bazel.
+  for varname in PATH CC BAZEL_VC BAZEL_VS BAZEL_PYTHON CPLUS_INCLUDEPATH; do
+    eval value=\$$varname
+    if [ ${value} ]; then
+      client_env="${client_env} --client_env=${varname}=${value}"
+    fi
+  done
+
   "${JAVA_HOME}/bin/java" \
       -XX:+HeapDumpOnOutOfMemoryError -Xverify:none -Dfile.encoding=ISO-8859-1 \
       -XX:HeapDumpPath=${OUTPUT_DIR} \
@@ -334,7 +343,7 @@ function run_bazel_jar() {
       --ignore_unsupported_sandboxing \
       --startup_time=329 --extract_data_time=523 \
       --rc_source=/dev/null --isatty=1 \
-      --ignore_client_env \
+      ${client_env} \
       --client_cwd=${PWD} \
       "${@}"
 }