diff options
| author |  ulfjack <ulfjack@google.com> | 2018-05-15 00:31:32 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-15 00:33:09 -0700 |
| commit | 27487c77387e457df18be3b6833697096d074eab (patch) | |
| tree | 0a789b99b8afb6572edfd4b8dd0274e394cfc91d /src/main/java/com/google/devtools/build/lib/rules/cpp | |
| parent | 150a9065620cc66c19ccc8c663d4fb41bb82a1ca (diff) | |
Slightly refactor SpawnAction to improve env handling
This is in preparation for fixing env handling as well as cache key (to use
env) computations in subclasses of SpawnAction.
PiperOrigin-RevId: 196626495
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java index 857e457a22..8c5e0561c8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendAction.java @@ -203,7 +203,8 @@ public final class LtoBackendAction extends SpawnAction { } fp.addPath(imports.getExecPath()); } - fp.addStringMap(getEnvironment()); + fp.addStringMap(env.getFixedEnv()); + fp.addStrings(env.getInheritedEnv()); fp.addStringMap(getExecutionInfo()); } |