Rollback of commit 6c6629ec707d23fbdb582bcede1dd9c967a9357e.

*** Reason for rollback ***

--
MOS_MIGRATED_REVID=113802087

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");
     }