From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 18 May 2017 22:44:12 +0000 (+0000)
Subject: re PR go/80814 (commit aa443150c83535fedccb3dee80daa7e01fafd92d causes a build error.)
X-Git-Tag: upstream/12.2.0~39383
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afbc9ecbf6c38730ac304a77e8f397f2509780f6;p=platform%2Fupstream%2Fgcc.git

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 5933801..72b86b7 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 5f3940a..ccadbd2 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 4386576..941a823 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 \