diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 16:05:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 19:50:01 +0200 |
| commit | 0e47fcced442d8e7c1b05184fdc1c14f10ed04ec (patch) | |
| tree | 4ae844bc0ec3c670f8697bdc24362c122fa718ad /gnu/packages/patches/go-fix-script-tests.patch | |
| parent | e4b70bc55a538569465bcedee19d1f2607308e65 (diff) | |
| parent | 8b1bde7bb3936a64244824500ffe60f123704437 (diff) | |
| download | guix-0e47fcced442d8e7c1b05184fdc1c14f10ed04ec.tar.gz guix-0e47fcced442d8e7c1b05184fdc1c14f10ed04ec.zip | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/go-fix-script-tests.patch')
| -rw-r--r-- | gnu/packages/patches/go-fix-script-tests.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gnu/packages/patches/go-fix-script-tests.patch b/gnu/packages/patches/go-fix-script-tests.patch new file mode 100644 index 0000000000..b29e83fef0 --- /dev/null +++ b/gnu/packages/patches/go-fix-script-tests.patch @@ -0,0 +1,18 @@ +Make library/header paths visible to cmd/go script tests, which is necessary for +cgo/gccgo tests to work correctly + +diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go +index dfaa40548e..9d0f0e9bcd 100644 +--- a/src/cmd/go/script_test.go ++++ b/src/cmd/go/script_test.go +@@ -100,6 +100,10 @@ const ( + var extraEnvKeys = []string{ + "SYSTEMROOT", // must be preserved on Windows to find DLLs; golang.org/issue/25210 + "WINDIR", // must be preserved on Windows to be able to run PowerShell command; golang.org/issue/30711 ++ "CPATH", ++ "C_INCLUDE_PATH", ++ "CPLUS_INCLUDE_PATH", ++ "LIBRARY_PATH", + "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 |