diff options
| author | Ian Lance Taylor <iant@golang.org> | 2017-07-15 17:50:18 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-07-15 17:50:18 +0000 |
| commit | 1e9a0e88c77646e36183e7dc55d181039ad83d11 (patch) | |
| tree | 776690e05be25f69814ab86c8abe2ea1c7ec44e2 /gotools | |
| parent | 049e777401bbd6e320f91ccb3d974991a9c8bb99 (diff) | |
Makefile.am (CHECK_ENV): Set GOROOT.
* Makefile.am (CHECK_ENV): Set GOROOT.
(ECHO_ENV): Report setting GOROOT.
* Makefile.in: Rebuild.
From-SVN: r250226
Diffstat (limited to 'gotools')
| -rw-r--r-- | gotools/ChangeLog | 6 | ||||
| -rw-r--r-- | gotools/Makefile.am | 6 | ||||
| -rw-r--r-- | gotools/Makefile.in | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog index 76028962dc6..2d33c70dc30 100644 --- a/gotools/ChangeLog +++ b/gotools/ChangeLog @@ -1,3 +1,9 @@ +2017-07-15 Ian Lance Taylor <iant@golang.org> + + * Makefile.am (CHECK_ENV): Set GOROOT. + (ECHO_ENV): Report setting GOROOT. + * Makefile.in: Rebuild. + 2017-06-29 Ian Lance Taylor <iant@golang.org> * Makefile.am (MOSTLYCLEANFILES): Remove testing files and logs. diff --git a/gotools/Makefile.am b/gotools/Makefile.am index 787a3c3d094..68a7003f8f5 100644 --- a/gotools/Makefile.am +++ b/gotools/Makefile.am @@ -174,11 +174,13 @@ CHECK_ENV = \ export GO_TESTING_GOTOOLS; \ abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \ LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ - export LD_LIBRARY_PATH; + export LD_LIBRARY_PATH; \ + GOROOT=$${abs_libgodir}; \ + export GOROOT; # ECHO_ENV is a variant of CHECK_ENV to put into a testlog file. # It assumes that abs_libgodir is set. -ECHO_ENV = PATH=`echo $(abs_builddir):$${PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'` GCCGO='$(abs_builddir)/check-gccgo' GCCGOTOOLDIR='$(abs_builddir)' GO_TESTING_GOTOOLS=yes LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'` +ECHO_ENV = PATH=`echo $(abs_builddir):$${PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'` GCCGO='$(abs_builddir)/check-gccgo' GCCGOTOOLDIR='$(abs_builddir)' GO_TESTING_GOTOOLS=yes LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'` GOROOT=`echo $${abs_libgodir}` # check-go-tools runs `go test cmd/go` in our environment. check-go-tool: go$(EXEEXT) cgo$(EXEEXT) check-head check-gccgo diff --git a/gotools/Makefile.in b/gotools/Makefile.in index 8f4eefabda4..e083bb473ad 100644 --- a/gotools/Makefile.in +++ b/gotools/Makefile.in @@ -338,12 +338,14 @@ MOSTLYCLEANFILES = \ @NATIVE_TRUE@ export GO_TESTING_GOTOOLS; \ @NATIVE_TRUE@ abs_libgodir=`cd $(libgodir) && $(PWD_COMMAND)`; \ @NATIVE_TRUE@ LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; \ -@NATIVE_TRUE@ export LD_LIBRARY_PATH; +@NATIVE_TRUE@ export LD_LIBRARY_PATH; \ +@NATIVE_TRUE@ GOROOT=$${abs_libgodir}; \ +@NATIVE_TRUE@ export GOROOT; # ECHO_ENV is a variant of CHECK_ENV to put into a testlog file. # It assumes that abs_libgodir is set. -@NATIVE_TRUE@ECHO_ENV = PATH=`echo $(abs_builddir):$${PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'` GCCGO='$(abs_builddir)/check-gccgo' GCCGOTOOLDIR='$(abs_builddir)' GO_TESTING_GOTOOLS=yes LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'` +@NATIVE_TRUE@ECHO_ENV = PATH=`echo $(abs_builddir):$${PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'` GCCGO='$(abs_builddir)/check-gccgo' GCCGOTOOLDIR='$(abs_builddir)' GO_TESTING_GOTOOLS=yes LD_LIBRARY_PATH=`echo $${abs_libgodir}/.libs:$${LD_LIBRARY_PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'` GOROOT=`echo $${abs_libgodir}` all: all-am .SUFFIXES: |