Skip to content

Commit

Permalink
bazel: move shared action_env above enable_platform_specific_config
Browse files Browse the repository at this point in the history
This fixes an issue where the PATH wasn't actually set to what we tried
to force as the default on macOS. I'm not sure if this is a bazel bug or
not, but either way it's surprising behavior.

bazelbuild/bazel#15270

Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>
  • Loading branch information
keith committed Apr 18, 2022
1 parent 52455a2 commit 64293c9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ build --java_runtime_version=remotejdk_11
build --tool_java_runtime_version=remotejdk_11
build --platform_mappings=bazel/platform_mappings

# Pass PATH, CC, CXX and LLVM_CONFIG variables from the environment.
build --action_env=CC
build --action_env=CXX
build --action_env=LLVM_CONFIG
build --action_env=PATH

build --enable_platform_specific_config

# Allow tags to influence execution requirements
Expand All @@ -39,12 +45,6 @@ build:linux --action_env=BAZEL_LINKOPTS=-lm
# We already have absl in the build, define absl=1 to tell googletest to use absl for backtrace.
build --define absl=1

# Pass PATH, CC, CXX and LLVM_CONFIG variables from the environment.
build --action_env=CC
build --action_env=CXX
build --action_env=LLVM_CONFIG
build --action_env=PATH

# Disable ICU linking for googleurl.
build --@com_googlesource_googleurl//build_config:system_icu=0

Expand Down

0 comments on commit 64293c9

Please sign in to comment.