re PR go/80814 (commit aa443150c83535fedccb3dee80daa7e01fafd92d causes a build error.)

	PR go/80814
	* Makefile.am (AM_GOCFLAGS): Define.
	* Makefile.in: Rebuild.

From-SVN: r248255

diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index 5933801ee75b3bf486f0d419eec194614d987715..72b86b76d7633861709079bf495e105185c793be 100644 (file)
--- 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 5f3940a278b3eafbf670ae6ee092ae8ea8e7de01..ccadbd25a8835bdd8371c771379ab89ef35a5509 100644 (file)
--- 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 4386576b011846c4226f19d926456531b3278083..941a82336ac57e241738bb64cdd02ab25e422d24 100644 (file)
--- 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 \