go/build: use GCCGOTOOLDIR to find gccgo tools

    Add the environment variable GCCGOTOOLDIR to permit overriding the default
    directory where tools like cgo are found when building with gccgo.

    This will be used by the cmd/go tests in a future CL.

    Reviewed-on: https://go-review.googlesource.com/45694

From-SVN: r249196

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 21bf5f28f22176a4cb841a254cc10d1edc032516..b73c3e1d88ac3c98b4966bda39a72ace10b7a40d 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-6d1d558109b5f5e53b31cc3325485dbb9f06d430
+a790c5fec06ced726c7f0f597186883ce61d0a45
 
 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/cmd/go/alldocs.go b/libgo/go/cmd/go/alldocs.go
index 3d5dd2b39725883fd01bb5541d8604c268ddd4fc..f946bf6105f022e4e94231d6ec36e45fccb8bc33 100644 (file)
--- a/libgo/go/cmd/go/alldocs.go
+++ b/libgo/go/cmd/go/alldocs.go
@@ -1143,6 +1143,9 @@
 //             Defined by Git. A colon-separated list of schemes that are allowed to be used
 //             with git fetch/clone. If set, any scheme not explicitly mentioned will be
 //             considered insecure by 'go get'.
+//     GCCGOTOOLDIR
+//             If set, where to find gccgo tools, such as cgo.
+//             The default is based on how gccgo was configured.
 //
 //
 // Import path syntax

diff --git a/libgo/go/cmd/go/help.go b/libgo/go/cmd/go/help.go
index 0c663ad463f679302a8280c85f8e32fad32844b7..6b7422c95c604d0722cc21e1b520cd4d605c56e1 100644 (file)
--- a/libgo/go/cmd/go/help.go
+++ b/libgo/go/cmd/go/help.go
@@ -508,6 +508,9 @@ Special-purpose environment variables:
                Defined by Git. A colon-separated list of schemes that are allowed to be used
                with git fetch/clone. If set, any scheme not explicitly mentioned will be
                considered insecure by 'go get'.
+       GCCGOTOOLDIR
+               If set, where to find gccgo tools, such as cgo.
+               The default is based on how gccgo was configured.
        `,
 }
 

diff --git a/libgo/go/go/build/build.go b/libgo/go/go/build/build.go
index 4e1b29fecd997b518cee8a57905e2d7a31f2bd07..cce5d482adab7c196ed385532d647e8c6cc598ae 100644 (file)
--- a/libgo/go/go/build/build.go
+++ b/libgo/go/go/build/build.go
@@ -1549,7 +1549,7 @@ func init() {
 
 func getToolDir() string {
        if runtime.Compiler == "gccgo" {
-               return runtime.GCCGOTOOLDIR
+               return envOr("GCCGOTOOLDIR", runtime.GCCGOTOOLDIR)
        } else {
                return filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
        }