re PR bootstrap/64023 (r216964 breaks bootstrap on darwin when using gcc as the boots...

	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.

From-SVN: r218705

diff --git a/ChangeLog b/ChangeLog
index cff736ece807e1e94f9afa0f8086d31b9332c16f..8236370cc99194dd6e32577d12e3d6ecb98c9811 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-12-13  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.
+
 2014-12-09  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
            Yury Gribov  <y.gribov@samsung.com>
 

diff --git a/Makefile.in b/Makefile.in
index ba5ae4c2ecb23535da040fec1ccd3e2e23cf7c87..8ffc313f157878e3822f8e41845447510a3ddf99 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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)

diff --git a/Makefile.tpl b/Makefile.tpl
index dcbc6b1b1435dbcac7b0eb5d09429306c8c9d0ea..bb8227eaafa76890b8947673b2641e23db0242e2 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -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)