]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go, cmd/link: set LC_ALL=C when checking if host compiler supports -no-pie
authorMichael Hudson-Doyle <michael.hudson@canonical.com>
Tue, 31 May 2016 08:05:39 +0000 (20:05 +1200)
committerMichael Hudson-Doyle <michael.hudson@canonical.com>
Tue, 31 May 2016 20:57:21 +0000 (20:57 +0000)
Fixes #15900

Change-Id: Ieada5f4e3b3b2ae358414e013f3090b4b820569b
Reviewed-on: https://go-review.googlesource.com/23536
Run-TryBot: Michael Hudson-Doyle <michael.hudson@canonical.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/cmd/go/build.go
src/cmd/link/internal/ld/lib.go

index e0cb216b8c4e5605f0e817aff95a905cdaa621d4..340fcd767b330b66b2372f9b24968c71ca3ebc6f 100644 (file)
@@ -3088,7 +3088,7 @@ func (b *builder) gccSupportsFlag(flag string) bool {
        }
        cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
        cmd.Dir = b.work
-       cmd.Env = envForDir(cmd.Dir, os.Environ())
+       cmd.Env = mergeEnvLists([]string{"LC_ALL=C"}, envForDir(cmd.Dir, os.Environ()))
        out, err := cmd.CombinedOutput()
        supported := err == nil && !bytes.Contains(out, []byte("unrecognized"))
        b.flagCache[flag] = supported
index bab71fb311437633bbfcb921f0713ae9cef5649e..ded5ac6de086e69b09d3f113273876d7ed1e63df 100644 (file)
@@ -1235,6 +1235,7 @@ func hostlink() {
                }
                cmd := exec.Command(argv[0], "-c", "-no-pie", "trivial.c")
                cmd.Dir = tmpdir
+               cmd.Env = append([]string{"LC_ALL=C"}, os.Environ()...)
                out, err := cmd.CombinedOutput()
                supported := err == nil && !bytes.Contains(out, []byte("unrecognized"))
                if supported {