Merge pull request #10305 from EricCousineau-TRI/issue/10304

bazelrc: Add platform-specific --action_env=PATH
RobotLocomotion · Jan 2, 2019 · 972825e · 972825e
2 parents e1f9389 + 2d97b78
commit 972825e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/tools/macos.bazelrc b/tools/macos.bazelrc
@@ -7,3 +7,7 @@ build --action_env=DRAKE_PYTHON_BIN_PATH=/usr/local/bin/python2
 # Explicit configuration for Python 3.
 build:python3 --python_path=/usr/local/bin/python3
 build:python3 --action_env=DRAKE_PYTHON_BIN_PATH=/usr/local/bin/python3
+
+# Configure ${PATH} for actions.
+# N.B. Ensure this is consistent with `execute.bzl`.
+build --action_env=PATH=/usr/local/bin:/usr/bin:/bin
diff --git a/tools/ubuntu-bionic.bazelrc b/tools/ubuntu-bionic.bazelrc
@@ -5,3 +5,7 @@ build --action_env=DRAKE_PYTHON_BIN_PATH=/usr/bin/python2
 # Explicit configuration for Python 3.
 build:python3 --python_path=/usr/bin/python3
 build:python3 --action_env=DRAKE_PYTHON_BIN_PATH=/usr/bin/python3
+
+# Configure ${PATH} for actions.
+# N.B. Ensure this is consistent with `execute.bzl`.
+build --action_env=PATH=/usr/bin:/bin
diff --git a/tools/ubuntu-xenial.bazelrc b/tools/ubuntu-xenial.bazelrc
@@ -5,3 +5,7 @@ build --action_env=DRAKE_PYTHON_BIN_PATH=/usr/bin/python2
 # Explicit configuration for Python 3.
 build:python3 --python_path=/usr/bin/python3
 build:python3 --action_env=DRAKE_PYTHON_BIN_PATH=/usr/bin/python3
+
+# Configure ${PATH} for actions.
+# N.B. Ensure this is consistent with `execute.bzl`.
+build --action_env=PATH=/usr/bin:/bin
diff --git a/tools/workspace/execute.bzl b/tools/workspace/execute.bzl
@@ -4,6 +4,9 @@ def path(repo_ctx, additional_search_paths = []):
  """Return the value of the PATH environment variable that would be used by
  the which() command."""
  search_paths = additional_search_paths
+
+ # N.B. Ensure ${PATH} in each platform `tools/*.bazelrc` matches these
+ # paths.
  if repo_ctx.os.name == "mac os x":
  search_paths = search_paths + ["/usr/local/bin"]
  search_paths = search_paths + ["/usr/bin", "/bin"]