commit 6c6629ec707d23fbdb582bcede1dd9c967a9357e
author Han-Wen Nienhuys <hanwen@google.com> Mon Jan 25 17:14:43 2016 +0000
committer Lukacs Berki <lberki@google.com> Tue Jan 26 13:05:29 2016 +0000
tree 8be8e651c4f794329200ad66d69453f4894c5d8b
parent ec5c07a953f546a7a336fc3ee2ba31cf6f36369a

Stop inserting local shell environment into CppCompileAction.

--
MOS_MIGRATED_REVID=112956748

src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java

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 7380a9a..8e87960 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 @@
    * 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");
     }