aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Han-Wen Nienhuys <hanwen@google.com>2016-01-25 17:14:43 +0000
committerGravatar Lukacs Berki <lberki@google.com>2016-01-26 13:05:29 +0000
commit6c6629ec707d23fbdb582bcede1dd9c967a9357e (patch)
tree8be8e651c4f794329200ad66d69453f4894c5d8b /src
parentec5c07a953f546a7a336fc3ee2ba31cf6f36369a (diff)
Stop inserting local shell environment into CppCompileAction.
-- MOS_MIGRATED_REVID=112956748
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java4
1 files changed, 3 insertions, 1 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 7380a9a50c..8e87960b0d 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
@@ -600,7 +600,9 @@ public class CppCompileAction extends AbstractAction implements IncludeScannable
* provided to the C++ compiler.
*/
public ImmutableMap<String, String> getEnvironment() {
- Map<String, String> environment = new LinkedHashMap<>(configuration.getLocalShellEnvironment());
+ Map<String, String> environment = new LinkedHashMap<>();
+ // LANG could affect the way that GCC interprets characters in string
+ environment.put("LANG", "en_US");
if (configuration.isCodeCoverageEnabled()) {
environment.put("PWD", "/proc/self/cwd");
}