| Message ID | 20141205224751.GS1923@tucnak.redhat.com |
|---|---|
| State | New |
| Headers | show |
Bootstrap just finished with the patch. Thanks, Dominique > Le 5 déc. 2014 à 23:47, Jakub Jelinek <jakub@redhat.com> a écrit : > > On Fri, Dec 05, 2014 at 11:34:28PM +0100, Dominique Dhumieres wrote: >>> As I've tried to explain, that is IMHO wrong though. >>> If what you are after is the -B stuff too, then perhaps: >>> ... >> >> Sorry but it does not work: > > Sorry, make that (just removed 4x ' in each file): > > 2014-12-05 Jakub Jelinek <jakub@redhat.com> > > PR bootstrap/64023 > * Makefile.tpl (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS > to POSTSTAGE1_LDFLAGS and STAGE1_LIBS to POSTSTAGE1_LIBS. > Add -B to libstdc++-v3/src/.libs and libstdc++-v3/libsupc++/.libs > to CXX. > * Makefile.in: Regenerated. > > --- Makefile.tpl.jj 2014-11-12 09:31:59.000000000 +0100 > +++ Makefile.tpl 2014-12-05 21:12:21.486031062 +0100 > @@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \ > 'AS=$(COMPILER_AS_FOR_TARGET)' \ > 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ > - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > + 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ > + -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ > + $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ > 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ > 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > @@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \ > 'WINDRES=$$(WINDRES_FOR_TARGET)' \ > 'WINDMC=$$(WINDMC_FOR_TARGET)' \ > 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ > + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ > + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ > "TFLAGS=$$TFLAGS" > > TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) > --- Makefile.in.jj 2014-11-28 14:40:52.000000000 +0100 > +++ Makefile.in 2014-12-05 21:11:48.276616008 +0100 > @@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \ > 'AS=$(COMPILER_AS_FOR_TARGET)' \ > 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ > - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > + 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ > + -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ > + $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ > 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ > 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > @@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \ > 'WINDRES=$$(WINDRES_FOR_TARGET)' \ > 'WINDMC=$$(WINDMC_FOR_TARGET)' \ > 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ > + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ > + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ > "TFLAGS=$$TFLAGS" > > TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) > > Jakub
This was for x86_64-apple-darwin14. The patch also works for x86_64-apple-darwin10. Dominique > Le 6 déc. 2014 à 01:49, Dominique d'Humières <dominiq@lps.ens.fr> a écrit : > > Bootstrap just finished with the patch. > > Thanks, > > Dominique
On 05/12/2014 23:47, Jakub Jelinek wrote: > On Fri, Dec 05, 2014 at 11:34:28PM +0100, Dominique Dhumieres wrote: >>> As I've tried to explain, that is IMHO wrong though. >>> If what you are after is the -B stuff too, then perhaps: >>> ... >> >> Sorry but it does not work: > > Sorry, make that (just removed 4x ' in each file): > > 2014-12-05 Jakub Jelinek <jakub@redhat.com> > > PR bootstrap/64023 > * Makefile.tpl (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS > to POSTSTAGE1_LDFLAGS and STAGE1_LIBS to POSTSTAGE1_LIBS. > Add -B to libstdc++-v3/src/.libs and libstdc++-v3/libsupc++/.libs > to CXX. > * Makefile.in: Regenerated. > > --- Makefile.tpl.jj 2014-11-12 09:31:59.000000000 +0100 > +++ Makefile.tpl 2014-12-05 21:12:21.486031062 +0100 > @@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \ > 'AS=$(COMPILER_AS_FOR_TARGET)' \ > 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ > - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > + 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ > + -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ > + $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ > 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ > 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > @@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \ > 'WINDRES=$$(WINDRES_FOR_TARGET)' \ > 'WINDMC=$$(WINDMC_FOR_TARGET)' \ > 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ > + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ > + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ > "TFLAGS=$$TFLAGS" > > TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) > --- Makefile.in.jj 2014-11-28 14:40:52.000000000 +0100 > +++ Makefile.in 2014-12-05 21:11:48.276616008 +0100 > @@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \ > 'AS=$(COMPILER_AS_FOR_TARGET)' \ > 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ > - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > + 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ > + -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ > + $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ > 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ > 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ > @@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \ > 'WINDRES=$$(WINDRES_FOR_TARGET)' \ > 'WINDMC=$$(WINDMC_FOR_TARGET)' \ > 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ > + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ > + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ > "TFLAGS=$$TFLAGS" > > TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) > > Jakub > If it also works for --disable-bootstrap, this is okay. Paolo
--- Makefile.tpl.jj 2014-11-12 09:31:59.000000000 +0100 +++ Makefile.tpl 2014-12-05 21:12:21.486031062 +0100 @@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \ 'AS=$(COMPILER_AS_FOR_TARGET)' \ 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ + 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ + -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ + $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ @@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ 'WINDMC=$$(WINDMC_FOR_TARGET)' \ 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ "TFLAGS=$$TFLAGS" TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) --- Makefile.in.jj 2014-11-28 14:40:52.000000000 +0100 +++ Makefile.in 2014-12-05 21:11:48.276616008 +0100 @@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \ 'AS=$(COMPILER_AS_FOR_TARGET)' \ 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ + 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ + -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ + $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ @@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ 'WINDMC=$$(WINDMC_FOR_TARGET)' \ 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ "TFLAGS=$$TFLAGS" TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)