From 80d920562c4e6852e148dec7e70c3df7ea360fb1 Mon Sep 17 00:00:00 2001 From: rwild Date: Sat, 20 Nov 2010 19:51:13 +0000 Subject: [PATCH] Fix missing regeneration of toplevel Makefile.in. /: * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166981 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog | 2 ++ Makefile.in | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dbf539418cc..fe178fb425b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2010-11-20 Ralf Wildenhues + * Makefile.in: Regenerate. + PR other/46202 * configure.ac: Fix just-built in-tree STRIP name to be binutils/strip-new. diff --git a/Makefile.in b/Makefile.in index ecca6e65718..c3cf12194db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -195,6 +195,7 @@ HOST_EXPORTS = \ CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \ GCJ="$(GCJ)"; export GCJ; \ GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \ + GOC="$(GOC)"; export GOC; \ AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ @@ -342,6 +343,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ GCJ_FOR_BUILD = @GCJ_FOR_BUILD@ GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@ +GOC_FOR_BUILD = @GOC_FOR_BUILD@ LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LD_FOR_BUILD = @LD_FOR_BUILD@ NM_FOR_BUILD = @NM_FOR_BUILD@ @@ -762,6 +764,7 @@ EXTRA_HOST_FLAGS = \ 'DLLTOOL=$(DLLTOOL)' \ 'GCJ=$(GCJ)' \ 'GFORTRAN=$(GFORTRAN)' \ + 'GOC=$(GOC)' \ 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ @@ -810,7 +813,7 @@ EXTRA_TARGET_FLAGS = \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ - 'GOC=$$(GOC_FOR_TARGET)' \ + 'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \ 'LD=$(COMPILER_LD_FOR_TARGET)' \ 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \ @@ -3167,6 +3170,7 @@ install-strip-target: \ maybe-install-strip-target-libquadmath \ maybe-install-strip-target-libgfortran \ maybe-install-strip-target-libobjc \ + maybe-install-strip-target-libgo \ maybe-install-strip-target-libtermcap \ maybe-install-strip-target-winsup \ maybe-install-strip-target-libgloss \ @@ -50890,6 +50894,21 @@ install-target-libgo: installdirs @endif target-libgo +.PHONY: install-strip-target-libgo maybe-install-strip-target-libgo +maybe-install-strip-target-libgo: +@if target-libgo +maybe-install-strip-target-libgo: install-strip-target-libgo + +install-strip-target-libgo: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libgo && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) + +@endif target-libgo + # Other targets (info, dvi, pdf, etc.) .PHONY: maybe-info-target-libgo info-target-libgo -- 2.11.0