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
szko-scripts</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=40cae204b994300452571f2c9e86d7dc6b83f627'>refs</a><a class='active' href='/guix/log/gnu/packages/emacs.scm'>log</a><a href='/guix/tree/gnu/packages/emacs.scm?id=40cae204b994300452571f2c9e86d7dc6b83f627'>tree</a><a href='/guix/commit/gnu/packages/emacs.scm?id=40cae204b994300452571f2c9e86d7dc6b83f627'>commit</a><a href='/guix/diff/gnu/packages/emacs.scm?id=40cae204b994300452571f2c9e86d7dc6b83f627'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/emacs.scm'>
<input type='hidden' name='id' value='40cae204b994300452571f2c9e86d7dc6b83f627'/><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=40cae204b994300452571f2c9e86d7dc6b83f627'>root</a>/<a href='/guix/log/gnu?id=40cae204b994300452571f2c9e86d7dc6b83f627'>gnu</a>/<a href='/guix/log/gnu/packages?id=40cae204b994300452571f2c9e86d7dc6b83f627'>packages</a>/<a href='/guix/log/gnu/packages/emacs.scm?id=40cae204b994300452571f2c9e86d7dc6b83f627'>emacs.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/packages/emacs.scm?id=40cae204b994300452571f2c9e86d7dc6b83f627&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-01-17 18:30:33 +0100'>2020-01-17</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=a3143063aeeecb5c02f75a6e1ddc0cc295e0e4f8'>Update email address for Amin Bandali.</a><span class='msg-avail'>...<span class='msg-tooltip'>* .mailmap: Add name and email addresses for Amin Bandali.
* gnu/local.mk, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/fpga.scm, gnu/packages/lean.scm, gnu/packages/maths.scm:
Update email address for Amin Bandali.

Signed-off-by: Tobias Geerinckx-Rice &lt;me@tobias.gr&gt;
</span></span></td><td>Amin Bandali</td></tr>
<tr><td><span title='2019-12-23 19:38:14 +0100'>2019-12-23</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=92d2205a19e9abc040fc245859613a4a582a8dcb'>gnu: Add emacs-next.</a><span class='msg-avail'>...<span class='msg-tooltip'>Add `emacs-next' for building latest Emacs from git.

* gnu/packages/emacs.scm (emacs-next): New variable.
(emacs): make the autoload deletion snippet not fail when eshell/esh-groups.el
does not exist.  This enables reuse of the entire snippet field of `emacs' for
`emacs-next'.
* gnu/packages/patches/emacs27-exec-path.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add the above patch file to it.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Amin Bandali</td></tr>
<tr><td><span title='2019-12-09 13:52:22 +0900'>2019-12-09</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=a7a492899adac5047e4b11c77edd881ac1276c37'>gnu: emacs: Delete the subdirs.el file under the site-lisp directory.</a><span class='msg-avail'>...<span class='msg-tooltip'>This fixes bug #38533 (see: https://bugs.gnu.org/38533).

* gnu/packages/emacs.scm (emacs)[phases]{install-site-start}: Delete the
subdirs.el file.

Reported-by:  Diego Nicola Barbato &lt;dnbarbato@posteo.de&gt;
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2019-12-07 13:20:50 +0900'>2019-12-07</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=3ffdd0026b045df320928e7f8736ea0c151e522b'>gnu: emacs: Reorder EMACSLOADPATH search path specification.</a><span class='msg-avail'>...<span class='msg-tooltip'>Move Guix profiles' site-lisp before Emacs' own in the search path
specification, so that user installed packages can override Emacs' builtin
versions.

Fixes issue #38399 (see: https://bugs.gnu.org/38399).

Reported-by: Diego Nicola Barbato &lt;dnbarbato@posteo.de&gt;

* gnu/packages/emacs.scm (emacs): Move the Emacs builtin library directory
suffix to the end of the search path.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2019-12-04 11:06:49 +0100'>2019-12-04</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=9aca5ceac81328d95474c928a0773662d332d16d'>gnu: emacs: Simplify the EMACSLOADPATH search path specification.</a><span class='msg-avail'>...<span class='msg-tooltip'>The EMACSLOADPATH can be greatly simplified by relying on a subdirs.el file
that causes Emacs to search recursively a directory found in EMACSLOADPATH.

* gnu/packages/emacs.scm (emacs)[native-search-paths]: Remove the match-all
file pattern regexp.  Remove the versioned site-lisp directory from searched
files, as it appears unused by Emacs.

Reported-by: Leo Prikler &lt;leo.prikler@student.tugraz.at&gt;
Signed-off-by: Clément Lassieur &lt;clement@lassieur.org&gt;
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2019-11-18 14:34:40 +0900'>2019-11-18</span></td><td><a href='/guix/commit/gnu/packages/emacs.scm?id=215a45d9b8e00cfcc3bf613de61c5d8ee304b512'>gnu: emacs: Locate Elisp libraries via EMACSLOADPATH.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/emacs.scm (emacs): Add a search path specification for
EMACSLOADPATH.
</span></span></td><td>Maxim Cournoyer</td></tr>