diff options
| author |  ulfjack <ulfjack@google.com> | 2018-05-17 03:27:55 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-17 03:29:38 -0700 |
| commit | 1b333a2c37add9d04fe5bc5258ee4f73c93115e2 (patch) | |
| tree | 0a425fd36a742eaeaa0dda2f16bff7e4a7f7b24b /src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java | |
| parent | 4ca4b8dd5b408fc397bcf2ed51f744fd1d0cffa3 (diff) | |
Fix Cpp{Compile,Link}Action environment and cache key computation
These were previously ignoring the inhertied environment, i.e.,
--action_env=PATH did _not_ result in the PATH variable being forwarded from
the client environment.
Fixes #5142.
PiperOrigin-RevId: 196966822
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index 9b826d0906..1ea286db8d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java @@ -478,6 +478,7 @@ public class SpawnAction extends AbstractAction implements ExecutionInfoSpecifie } @Override + @VisibleForTesting public final ImmutableMap<String, String> getEnvironment() { // TODO(ulfjack): AbstractAction should declare getEnvironment with a return value of type // ActionEnvironment to avoid developers misunderstanding the purpose of this method. That |