From afbc9ecbf6c38730ac304a77e8f397f2509780f6 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor <iant@golang.org> Date: Thu, 18 May 2017 22:44:12 +0000 Subject: [PATCH] re PR go/80814 (commit aa443150c83535fedccb3dee80daa7e01fafd92d causes a build error.) PR go/80814 * Makefile.am (AM_GOCFLAGS): Define. * Makefile.in: Rebuild. From-SVN: r248255 --- gotools/ChangeLog | 6 ++++++ gotools/Makefile.am | 1 + gotools/Makefile.in | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gotools/ChangeLog b/gotools/ChangeLog index 5933801ee75b..72b86b76d763 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 5f3940a278b3..ccadbd25a883 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 4386576b0118..941a82336ac5 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 \ -- GitLab