This libgo patch by Nikhil Benesch updates the net/http/cgi package to
incorporate upstream modifications to the cgi package's set of rules
about which environment variables should be inherited by child
processes by default on each platform.  In particular this permits
tests to pass on NetBSD by preserving the value of the LD_LIBRARY_PATH
environment variable.

This is a partial backport of the following upstream CLs:

    https://golang.org/cl/263802
    https://golang.org/cl/263577
    https://golang.org/cl/254740

Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu.  Committed
to mainline.

Ian
e4b34e8508b6eab7b129a9ada549d2649b3152e9
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 384ca6e8864..3ad6c9633f1 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-fa66bd11bbe58943e273cfa74356771c996f5b24
+28f3df468666787f83f94220312383a7c267a8ce
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/net/http/cgi/host.go b/libgo/go/net/http/cgi/host.go
index 863f40638ab..eff67caf4e6 100644
--- a/libgo/go/net/http/cgi/host.go
+++ b/libgo/go/net/http/cgi/host.go
@@ -37,15 +37,15 @@ var trailingPort = regexp.MustCompile(`:([0-9]+)$`)
 
 var osDefaultInheritEnv = func() []string {
        switch runtime.GOOS {
-       case "darwin":
+       case "darwin", "ios":
                return []string{"DYLD_LIBRARY_PATH"}
-       case "linux", "freebsd", "openbsd":
+       case "linux", "freebsd", "netbsd", "openbsd":
                return []string{"LD_LIBRARY_PATH"}
        case "hpux":
                return []string{"LD_LIBRARY_PATH", "SHLIB_PATH"}
        case "irix":
                return []string{"LD_LIBRARY_PATH", "LD_LIBRARYN32_PATH", 
"LD_LIBRARY64_PATH"}
-       case "solaris":
+       case "illumos", "solaris":
                return []string{"LD_LIBRARY_PATH", "LD_LIBRARY_PATH_32", 
"LD_LIBRARY_PATH_64"}
        case "windows":
                return []string{"SystemRoot", "COMSPEC", "PATHEXT", "WINDIR"}

Reply via email to