Skip to content
This repository was archived by the owner on Jan 11, 2024. It is now read-only.

Commit 755669f

Browse files
damienmgkchodorow
authored andcommitted
Pass all the environment variable to Bazel during bootstrapping
We might be using more environment variables that the actual list. To be cherry-picked for bazelbuild#2692. Fixes bazelbuild#2953. Change-Id: I9b926d48e14b2c65822770ab46f6507a5303c3d3 PiperOrigin-RevId: 155387369
1 parent c32ad5e commit 755669f

1 file changed

Lines changed: 3 additions & 29 deletions

File tree

scripts/bootstrap/compile.sh

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -325,35 +325,9 @@ function run_bazel_jar() {
325325
local command=$1
326326
shift
327327
local client_env=()
328-
# Propagate important environment variables to bootstrapped Bazel.
329-
local env_vars="ABI_LIBC_VERSION"
330-
env_vars="$env_vars ABI_VERSION"
331-
env_vars="$env_vars BAZEL_COMPILER "
332-
env_vars="$env_vars BAZEL_HOST_SYSTEM"
333-
env_vars="$env_vars BAZEL_PYTHON"
334-
env_vars="$env_vars BAZEL_SH"
335-
env_vars="$env_vars BAZEL_TARGET_CPU"
336-
env_vars="$env_vars BAZEL_TARGET_LIBC"
337-
env_vars="$env_vars BAZEL_TARGET_SYSTEM"
338-
env_vars="$env_vars BAZEL_VC"
339-
env_vars="$env_vars BAZEL_VS"
340-
env_vars="$env_vars CC"
341-
env_vars="$env_vars CC_TOOLCHAIN_NAME"
342-
env_vars="$env_vars CPLUS_INCLUDE_PATH"
343-
env_vars="$env_vars CUDA_COMPUTE_CAPABILITIES"
344-
env_vars="$env_vars CUDA_PATH"
345-
env_vars="$env_vars HOMEBREW_RUBY_PATH"
346-
env_vars="$env_vars INCLUDE"
347-
env_vars="$env_vars LIB"
348-
env_vars="$env_vars NO_WHOLE_ARCHIVE_OPTION"
349-
env_vars="$env_vars PATH"
350-
env_vars="$env_vars SYSTEMROOT"
351-
env_vars="$env_vars TMP"
352-
env_vars="$env_vars VS90COMNTOOLS"
353-
env_vars="$env_vars VS100COMNTOOLS"
354-
env_vars="$env_vars VS110COMNTOOLS"
355-
env_vars="$env_vars VS120COMNTOOLS"
356-
env_vars="$env_vars VS140COMNTOOLS"
328+
# Propagate all environment variables to bootstrapped Bazel.
329+
# See https://stackoverflow.com/41898503/loop-over-environment-variables-in-posix.sh
330+
local env_vars="$(awk 'END { for (name in ENVIRON) { if(name != "_") print name; } }' </dev/null)"
357331
for varname in $env_vars; do
358332
eval value=\$$varname
359333
if [ "${value}" ]; then

0 commit comments

Comments
 (0)