diff options
author | 2016-02-04 01:36:11 +0000 | |
---|---|---|
committer | 2016-02-04 18:11:00 +0000 | |
commit | 092dee3fad52c2f9c2b17447c58f31dba5be438a (patch) | |
tree | caae13abe07cc8f360401b668c97b17253191549 /src/main/java/com/google/devtools/build/lib/rules | |
parent | b795e6bd2a2371a4a9f5e1b2cd618fdd7eceb30a (diff) |
Rollback of commit 6c6629ec707d23fbdb582bcede1dd9c967a9357e.
*** Reason for rollback ***
--
MOS_MIGRATED_REVID=113802087
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index ead89f63e3..32cfeb4aee 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -588,9 +588,7 @@ public class CppCompileAction extends AbstractAction implements IncludeScannable * provided to the C++ compiler. */ public ImmutableMap<String, String> getEnvironment() { - Map<String, String> environment = new LinkedHashMap<>(); - // LANG could affect the way that GCC interprets characters in string - environment.put("LANG", "en_US"); + Map<String, String> environment = new LinkedHashMap<>(configuration.getLocalShellEnvironment()); if (configuration.isCodeCoverageEnabled()) { environment.put("PWD", "/proc/self/cwd"); } |