From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 27 Feb 2019 01:11:20 +0000 (+0000)
Subject: cmd/go: preserve CC for TestScript child processes
X-Git-Tag: basepoints/gcc-10~910
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15994bfbcaf3c71f9e33b080d62ec46690674552;p=thirdparty%2Fgcc.git

cmd/go: preserve CC for TestScript child processes

    Reviewed-on: https://go-review.googlesource.com/c/158838

From-SVN: r269240
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d3515f8672ff..d601bb99cff0 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-558fcb7bf2a6b78bdba87f20a8a4a95d27125d74
+9c1859b8e97242b0e697a3aaa39a4da5e6172e74
 
 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/script_test.go b/libgo/go/cmd/go/script_test.go
index 1acc61f3b383..3002db767993 100644
--- a/libgo/go/cmd/go/script_test.go
+++ b/libgo/go/cmd/go/script_test.go
@@ -83,13 +83,12 @@ type backgroundCmd struct {
 }
 
 var extraEnvKeys = []string{
-	"SYSTEMROOT",      // must be preserved on Windows to find DLLs; golang.org/issue/25210
-	"LD_LIBRARY_PATH", // must be preserved on Unix systems to find shared libraries
-
-	// For gccgo testing.
-	"GO_TESTING_GOTOOLS",
-	"GCCGO",
-	"GCCGOTOOLDIR",
+	"SYSTEMROOT",         // must be preserved on Windows to find DLLs; golang.org/issue/25210
+	"LD_LIBRARY_PATH",    // must be preserved on Unix systems to find shared libraries
+	"CC",                 // don't lose user settings when invoking cgo
+	"GO_TESTING_GOTOOLS", // for gccgo testing
+	"GCCGO",              // for gccgo testing
+	"GCCGOTOOLDIR",       // for gccgo testing
 }
 
 // setup sets up the test execution temporary directory and environment.