From 6c6629ec707d23fbdb582bcede1dd9c967a9357e Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@google.com>
Date: Mon, 25 Jan 2016 17:14:43 +0000
Subject: Stop inserting local shell environment into CppCompileAction.

--
MOS_MIGRATED_REVID=112956748
---
 .../com/google/devtools/build/lib/rules/cpp/CppCompileAction.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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");
     }
-- 
cgit v1.2.3