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
ts</option>
</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=37076a20f9b8eb17566dfaaef7858205b2e71545'>refs</a><a class='active' href='/guix/log/gnu/tests/ssh.scm'>log</a><a href='/guix/tree/gnu/tests/ssh.scm?id=37076a20f9b8eb17566dfaaef7858205b2e71545'>tree</a><a href='/guix/commit/gnu/tests/ssh.scm?id=37076a20f9b8eb17566dfaaef7858205b2e71545'>commit</a><a href='/guix/diff/gnu/tests/ssh.scm?id=37076a20f9b8eb17566dfaaef7858205b2e71545'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/ssh.scm'>
<input type='hidden' name='id' value='37076a20f9b8eb17566dfaaef7858205b2e71545'/><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=37076a20f9b8eb17566dfaaef7858205b2e71545'>root</a>/<a href='/guix/log/gnu?id=37076a20f9b8eb17566dfaaef7858205b2e71545'>gnu</a>/<a href='/guix/log/gnu/tests?id=37076a20f9b8eb17566dfaaef7858205b2e71545'>tests</a>/<a href='/guix/log/gnu/tests/ssh.scm?id=37076a20f9b8eb17566dfaaef7858205b2e71545'>ssh.scm</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/gnu/tests/ssh.scm?id=37076a20f9b8eb17566dfaaef7858205b2e71545&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-05-22 21:56:40 +0200'>2022-05-22</span></td><td><a href='/guix/commit/gnu/tests/ssh.scm?id=d2b3400f79ffaed3357650307376ab69a7ec3b1b'>services: openssh: Listen on both IPv4 and IPv6.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/55335&gt;.
Reported by Christopher Baines &lt;mail@cbaines.net&gt;.

* gnu/services/ssh.scm (openssh-shepherd-service)[inetd-style?]: New variable.
&lt;start&gt;: Use it.  When using 'make-inetd-constructor', pass a list of
endpoints as is possible with the Shepherd 0.9.1.
&lt;stop&gt;: Adjust accordingly.
* gnu/tests/ssh.scm (run-ssh-test)["wait for port 22"]: Rename to...
["wait for port 22, IPv4"]: ... this.
["wait for port 22, IPv6"]: New test.
</span></span></td><td>Ludovic Courtès</td></tr>
ccesary because vim's built-in plugin manager looks for directories
    under 'package-path' instead of 'runtime-path.' Once we have told vim the
    package-path, it adds all the packages to the runtime-path automatically for us.

* gnu/packages/aux-files/guix.vim: Add paths to packagepath instead of
runtimepath.  Remove code to adjust runtimepath after adding paths.

Signed-off-by: Efraim Flashner &lt;efraim@flashner.co.il&gt;


</td></tr>