re PR go/66147 (go fails to cross build)

./:	PR go/66147
	* Makefile.tpl (HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET.
	* Makefile.in: Regenerate.
gotools/:
	PR go/66147
	* Makefile.am (GOCOMPILER): In NATIVE case, add
	$(XGCC_FLAGS_FOR_TARGET).

From-SVN: r231199

diff --git a/ChangeLog b/ChangeLog
index 1221651e31a98b32357ffba0358bac2c01e3f8bd..7f9b17d39f170219b696683afa73de33acf5ab9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-02  Ian Lance Taylor  <iant@google.com>
+
+       PR go/66147
+       * Makefile.tpl (HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET.
+       * Makefile.in: Regenerate.
+
 2015-12-01  Andreas Tobler  <andreast@gcc.gnu.org>
 
        PR libffi/65726

diff --git a/Makefile.in b/Makefile.in
index 66817b34a705a23751c1c8a234297c71c4f9f0cf..cb62c35ade54b8c33334ff870a7928daa5aa3a8f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -224,6 +224,7 @@ HOST_EXPORTS = \
        ISLINC="$(HOST_ISLINC)"; export ISLINC; \
        LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
        LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
+       XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
 @if gcc-bootstrap
        $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 @endif gcc-bootstrap

diff --git a/Makefile.tpl b/Makefile.tpl
index beabadc6213d886781c2a46e785e831737b905ac..693e4d5c58a2740c520d2411c0166704269af7ca 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -227,6 +227,7 @@ HOST_EXPORTS = \
        ISLINC="$(HOST_ISLINC)"; export ISLINC; \
        LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
        LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
+       XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
 @if gcc-bootstrap
        $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 @endif gcc-bootstrap

diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index afe08984f34a48959db3086cb9261d6be6f33c28..5ddd685a9cb7a693d477a139693fa30f442c1834 100644 (file)
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-02  Ian Lance Taylor  <iant@google.com>
+
+       PR go/66147
+       * Makefile.am (GOCOMPILER): In NATIVE case, add
+       $(XGCC_FLAGS_FOR_TARGET).
+
 2015-10-31  Ian Lance Taylor  <iant@google.com>
 
        * Makefile.am (go_cmd_go_files): Update to Go 1.5.1 library by

diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 131f6d5680b62620d4fb496eed204e4bd88d04b6..30c280e62726429cbcc0d9d9e352c3f11157b261 100644 (file)
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -30,7 +30,7 @@ LIBGODEP = $(libgodir)/libgo.la
 
 if NATIVE
 # Use the compiler we just built.
-GOCOMPILER = $(GOC_FOR_TARGET)
+GOCOMPILER = $(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET)
 else
 GOCOMPILER = $(GOC)
 endif

diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index 443b626fb855c6a9c39a0b3b04be7d995b595d9b..54409cd9baf4b761f9bb8b40e0bc0d276a4787ac 100644 (file)
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -256,7 +256,7 @@ LIBGODEP = $(libgodir)/libgo.la
 @NATIVE_FALSE@GOCOMPILER = $(GOC)
 
 # Use the compiler we just built.
-@NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET)
+@NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET)
 GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
 AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs
 GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
@@ -563,8 +563,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 \