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
tion>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=e4abf26a0fab51fcd73efc48ae17bebece300cab'>refs</a><a class='active' href='/guix/log/.gitattributes'>log</a><a href='/guix/tree/.gitattributes?id=e4abf26a0fab51fcd73efc48ae17bebece300cab'>tree</a><a href='/guix/commit/.gitattributes?id=e4abf26a0fab51fcd73efc48ae17bebece300cab'>commit</a><a href='/guix/diff/.gitattributes?id=e4abf26a0fab51fcd73efc48ae17bebece300cab'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/.gitattributes'>
<input type='hidden' name='id' value='e4abf26a0fab51fcd73efc48ae17bebece300cab'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=e4abf26a0fab51fcd73efc48ae17bebece300cab'>root</a>/<a href='/guix/log/.gitattributes?id=e4abf26a0fab51fcd73efc48ae17bebece300cab'>.gitattributes</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/.gitattributes?id=e4abf26a0fab51fcd73efc48ae17bebece300cab&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-10-14 00:24:34 +0200'>2021-10-14</span></td><td><a href='/guix/commit/.gitattributes?id=f8b10932c86cf4c1657a67e8c484d76f757b64bd'>Add git configuration templates to improve diff hunk header detection.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a follow-up to commit 9fc8ae4171e5da4939a64fc6d684c8b9d85bbe84, which
missed two hunks from &lt;https://issues.guix.gnu.org/50363&gt;.

Reported by hackeryarn on #guix.

* .gitattributes, etc/git/gitconfig: New files.

Signed-off-by: Marius Bakke &lt;marius@gnu.org&gt;
</span></span></td><td>Sarah Morgensen</td></tr>