aboutsummaryrefslogtreecommitdiff
path: root/libgo/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-02-27 01:11:20 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-02-27 01:11:20 +0000
commit15994bfbcaf3c71f9e33b080d62ec46690674552 (patch)
tree005104a55f53d82a215715f015792a10582d1c84 /libgo/go
parent571fd26cf119ed6c4939ae6c83c0e2c1a2bd3fb2 (diff)
downloadgcc-15994bfbcaf3c71f9e33b080d62ec46690674552.zip
gcc-15994bfbcaf3c71f9e33b080d62ec46690674552.tar.gz
gcc-15994bfbcaf3c71f9e33b080d62ec46690674552.tar.bz2
cmd/go: preserve CC for TestScript child processes
Reviewed-on: https://go-review.googlesource.com/c/158838 From-SVN: r269240
Diffstat (limited to 'libgo/go')
-rw-r--r--libgo/go/cmd/go/script_test.go13
1 files changed, 6 insertions, 7 deletions
diff --git a/libgo/go/cmd/go/script_test.go b/libgo/go/cmd/go/script_test.go
index 1acc61f..3002db7 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.