From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Thu, 15 Mar 2018 16:56:24 +0000 (+0000)
Subject: cmd/go: force LANG=C when looking for compiler version
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8bb2726d08ae3dd89c7085a7972b5a144ccea270;p=gcc.git

cmd/go: force LANG=C when looking for compiler version

    Tested by installing the gcc-locales package and running
        LANG=de_DE.utf8 go build hello.go
    Without this change, that fails, as described at
    https://gcc.gnu.org/PR84765.

    Reviewed-on: https://go-review.googlesource.com/100737

From-SVN: r258565
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 807609bb6b6..6e4c73b161d 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ce28919112dbb234366816ab39ce060ad45e8ca9
+e4464efc767b8dee4f4c18ffaf6c891f7b9deee7
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/cmd/go/internal/work/buildid.go b/libgo/go/cmd/go/internal/work/buildid.go
index e2ae85083d8..a08de26c823 100644
--- a/libgo/go/cmd/go/internal/work/buildid.go
+++ b/libgo/go/cmd/go/internal/work/buildid.go
@@ -234,7 +234,18 @@ func (b *Builder) gccgoToolID(name, language string) (string, error) {
 	// compile an empty file on standard input.
 	cmdline := str.StringList(cfg.BuildToolexec, name, "-###", "-x", language, "-c", "-")
 	cmd := exec.Command(cmdline[0], cmdline[1:]...)
-	cmd.Env = base.EnvForDir(cmd.Dir, os.Environ())
+
+	// Strip any LANG or LC_ environment variables, and force
+	// LANG=C, so that we get the untranslated output.
+	var env []string
+	for _, e := range os.Environ() {
+		if !strings.HasPrefix(e, "LANG=") && !strings.HasPrefix(e, "LC_") {
+			env = append(env, e)
+		}
+	}
+	env = append(env, "LANG=C")
+
+	cmd.Env = base.EnvForDir(cmd.Dir, env)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		return "", fmt.Errorf("%s: %v; output: %q", name, err, out)