re PR bootstrap/64023 (r216964 breaks bootstrap on darwin when using gcc as the bootstrap compiler.)
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
This commit is contained in:
parent
9ac18f8c2a
commit
b6a65eb6fa
@ -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>
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user