diff options
| author | Ian Lance Taylor <iant@google.com> | 2015-12-02 19:27:58 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-12-02 19:27:58 +0000 |
| commit | 105b682e138221fe33886c43379cdf3110112c74 (patch) | |
| tree | 8be7de1b11e1883e8227d0eebd156b6f1df71c99 | |
| parent | f479b43da091fd3ede525b7832cd69a22fb49f9a (diff) | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | Makefile.tpl | 1 | ||||
| -rw-r--r-- | gotools/ChangeLog | 6 | ||||
| -rw-r--r-- | gotools/Makefile.am | 2 | ||||
| -rw-r--r-- | gotools/Makefile.in | 4 |
6 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 1221651e31a..7f9b17d39f1 100644 --- 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 66817b34a70..cb62c35ade5 100644 --- 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 beabadc6213..693e4d5c58a 100644 --- 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 afe08984f34..5ddd685a9cb 100644 --- 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 131f6d5680b..30c280e6272 100644 --- 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 443b626fb85..54409cd9baf 100644 --- 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 \ |