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
</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=bc6783d9c07be9003764fa345801d3fffe58c2ca'>refs</a><a class='active' href='/guix/log/nix/AUTHORS'>log</a><a href='/guix/tree/nix/AUTHORS?id=bc6783d9c07be9003764fa345801d3fffe58c2ca'>tree</a><a href='/guix/commit/nix/AUTHORS?id=bc6783d9c07be9003764fa345801d3fffe58c2ca'>commit</a><a href='/guix/diff/nix/AUTHORS?id=bc6783d9c07be9003764fa345801d3fffe58c2ca'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/AUTHORS'>
<input type='hidden' name='id' value='bc6783d9c07be9003764fa345801d3fffe58c2ca'/><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=bc6783d9c07be9003764fa345801d3fffe58c2ca'>root</a>/<a href='/guix/log/nix?id=bc6783d9c07be9003764fa345801d3fffe58c2ca'>nix</a>/<a href='/guix/log/nix/AUTHORS?id=bc6783d9c07be9003764fa345801d3fffe58c2ca'>AUTHORS</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/nix/AUTHORS?id=bc6783d9c07be9003764fa345801d3fffe58c2ca&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>