diff options
| author | Ian Lance Taylor <iant@golang.org> | 2017-05-18 22:44:12 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2017-05-18 22:44:12 +0000 |
| commit | afbc9ecbf6c38730ac304a77e8f397f2509780f6 (patch) | |
| tree | d1b64c743ef3fbf15a430f0958ca75bc3c97d313 /gotools | |
| parent | 52e14b96bd537b5431c577213c14db4686397d71 (diff) | |
re PR go/80814 (commit aa443150c83535fedccb3dee80daa7e01fafd92d causes a build error.)
PR go/80814
* Makefile.am (AM_GOCFLAGS): Define.
* Makefile.in: Rebuild.
From-SVN: r248255
Diffstat (limited to 'gotools')
| -rw-r--r-- | gotools/ChangeLog | 6 | ||||
| -rw-r--r-- | gotools/Makefile.am | 1 | ||||
| -rw-r--r-- | gotools/Makefile.in | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog index 5933801ee75..72b86b76d76 100644 --- a/gotools/ChangeLog +++ b/gotools/ChangeLog @@ -1,3 +1,9 @@ +2017-05-18 Ian Lance Taylor <iant@golang.org> + + PR go/80814 + * Makefile.am (AM_GOCFLAGS): Define. + * Makefile.in: Rebuild. + 2017-01-13 Ian Lance Taylor <iant@golang.org> Updates for Go 1.8rc1. diff --git a/gotools/Makefile.am b/gotools/Makefile.am index 5f3940a278b..ccadbd25a88 100644 --- a/gotools/Makefile.am +++ b/gotools/Makefile.am @@ -38,6 +38,7 @@ endif GOCFLAGS = $(CFLAGS_FOR_TARGET) GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS) +AM_GOCFLAGS = -I $(libgodir) AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ diff --git a/gotools/Makefile.in b/gotools/Makefile.in index 4386576b011..941a82336ac 100644 --- a/gotools/Makefile.in +++ b/gotools/Makefile.in @@ -258,6 +258,7 @@ LIBGODEP = $(libgodir)/libgo.la # Use the compiler we just built. @NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS) +AM_GOCFLAGS = -I $(libgodir) AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ cmdsrcdir = $(srcdir)/../libgo/go/cmd @@ -565,8 +566,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@NATIVE_FALSE@uninstall-local: @NATIVE_FALSE@install-exec-local: +@NATIVE_FALSE@uninstall-local: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ |