Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Azkali:Tegra
gcc7
gcc7-stage1-build-libstdc++.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gcc7-stage1-build-libstdc++.patch of Package gcc7
diff --git a/Makefile.in b/Makefile.in index b824e0a0c..e84ba7427 100644 --- a/Makefile.in +++ b/Makefile.in @@ -224,7 +224,7 @@ HOST_EXPORTS = \ 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); \ + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH_BUILD_LIBSTDC++)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ @endif gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); @@ -250,6 +250,7 @@ POSTSTAGE1_CXX_EXPORT = \ # Similar, for later GCC stages. POSTSTAGE1_HOST_EXPORTS = \ $(HOST_EXPORTS) \ + $(POSTSTAGE1_RPATH_EXPORT) \ CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ \ $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ @@ -291,7 +292,7 @@ BASE_TARGET_EXPORTS = \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ @if gcc-bootstrap - $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH_BUILD_LIBSTDC++)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ @endif gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS; @@ -305,6 +306,17 @@ NORMAL_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; +# Use the target libstdc++ only after stage1 since the build libstdc++ is +# required by some stage1 host modules (e.g. cc1, cc1plus, lto1) +POSTSTAGE1_RPATH_EXPORT = \ +@if target-libstdc++-v3-bootstrap + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH_libstdc++-v3)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); +@endif target-libstdc++-v3-bootstrap + +# Similar, for later GCC stages. +POSTSTAGE1_TARGET_EXPORTS = \ + $(POSTSTAGE1_RPATH_EXPORT) + # Where to find GMP HOST_GMPLIBS = @gmplibs@ HOST_GMPINC = @gmpinc@ @@ -600,6 +612,8 @@ all: # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the target machine work. TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc) +# Use the build rather than the target libstdc++ +TARGET_LIB_PATH_BUILD_LIBSTDC++ = $(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc) @if target-libstdc++-v3 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs: @@ -36328,7 +36342,7 @@ configure-stage2-target-libstdc++-v3: fi; \ test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -36373,7 +36387,7 @@ configure-stage3-target-libstdc++-v3: fi; \ test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -36418,7 +36432,7 @@ configure-stage4-target-libstdc++-v3: fi; \ test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -36463,7 +36477,7 @@ configure-stageprofile-target-libstdc++-v3: fi; \ test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -36508,7 +36522,7 @@ configure-stagefeedback-target-libstdc++-v3: fi; \ test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -36553,7 +36567,7 @@ configure-stageautoprofile-target-libstdc++-v3: fi; \ test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -36598,7 +36612,7 @@ configure-stageautofeedback-target-libstdc++-v3: fi; \ test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -37484,7 +37498,7 @@ configure-stage2-target-libsanitizer: fi; \ test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -37529,7 +37543,7 @@ configure-stage3-target-libsanitizer: fi; \ test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -37574,7 +37588,7 @@ configure-stage4-target-libsanitizer: fi; \ test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -37619,7 +37633,7 @@ configure-stageprofile-target-libsanitizer: fi; \ test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -37664,7 +37678,7 @@ configure-stagefeedback-target-libsanitizer: fi; \ test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -37709,7 +37723,7 @@ configure-stageautoprofile-target-libsanitizer: fi; \ test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -37754,7 +37768,7 @@ configure-stageautofeedback-target-libsanitizer: fi; \ test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -38640,7 +38654,7 @@ configure-stage2-target-libmpx: fi; \ test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -38685,7 +38699,7 @@ configure-stage3-target-libmpx: fi; \ test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -38730,7 +38744,7 @@ configure-stage4-target-libmpx: fi; \ test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -38775,7 +38789,7 @@ configure-stageprofile-target-libmpx: fi; \ test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -38820,7 +38834,7 @@ configure-stagefeedback-target-libmpx: fi; \ test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -38865,7 +38879,7 @@ configure-stageautoprofile-target-libmpx: fi; \ test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -38910,7 +38924,7 @@ configure-stageautofeedback-target-libmpx: fi; \ test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -39796,7 +39810,7 @@ configure-stage2-target-libvtv: fi; \ test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -39841,7 +39855,7 @@ configure-stage3-target-libvtv: fi; \ test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -39886,7 +39900,7 @@ configure-stage4-target-libvtv: fi; \ test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -39931,7 +39945,7 @@ configure-stageprofile-target-libvtv: fi; \ test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -39976,7 +39990,7 @@ configure-stagefeedback-target-libvtv: fi; \ test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -40021,7 +40035,7 @@ configure-stageautoprofile-target-libvtv: fi; \ test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -40066,7 +40080,7 @@ configure-stageautofeedback-target-libvtv: fi; \ test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ $(RAW_CXX_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -42784,7 +42798,7 @@ configure-stage2-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -42829,7 +42843,7 @@ configure-stage3-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -42874,7 +42888,7 @@ configure-stage4-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -42919,7 +42933,7 @@ configure-stageprofile-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -42964,7 +42978,7 @@ configure-stagefeedback-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -43009,7 +43023,7 @@ configure-stageautoprofile-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -43054,7 +43068,7 @@ configure-stageautofeedback-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -49809,7 +49823,7 @@ configure-stage2-target-libgomp: fi; \ test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -49854,7 +49868,7 @@ configure-stage3-target-libgomp: fi; \ test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -49899,7 +49913,7 @@ configure-stage4-target-libgomp: fi; \ test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -49944,7 +49958,7 @@ configure-stageprofile-target-libgomp: fi; \ test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -49989,7 +50003,7 @@ configure-stagefeedback-target-libgomp: fi; \ test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -50034,7 +50048,7 @@ configure-stageautoprofile-target-libgomp: fi; \ test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ @@ -50079,7 +50093,7 @@ configure-stageautofeedback-target-libgomp: fi; \ test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ + $(POSTSTAGE1_TARGET_EXPORTS) \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ diff --git a/Makefile.tpl b/Makefile.tpl index d0fa07005..10714a847 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -227,7 +227,7 @@ HOST_EXPORTS = \ 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); \ + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH_BUILD_LIBSTDC++)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ @endif gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); @@ -253,6 +253,7 @@ POSTSTAGE1_CXX_EXPORT = \ # Similar, for later GCC stages. POSTSTAGE1_HOST_EXPORTS = \ $(HOST_EXPORTS) \ + $(POSTSTAGE1_RPATH_EXPORT) \ CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ \ $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ @@ -294,7 +295,7 @@ BASE_TARGET_EXPORTS = \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ @if gcc-bootstrap - $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH_BUILD_LIBSTDC++)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ @endif gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS; @@ -308,6 +309,17 @@ NORMAL_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; +# Use the target libstdc++ only after stage1 since the build libstdc++ is +# required by some stage1 host modules (e.g. cc1, cc1plus, lto1) +POSTSTAGE1_RPATH_EXPORT = \ +@if target-libstdc++-v3-bootstrap + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH_libstdc++-v3)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); +@endif target-libstdc++-v3-bootstrap + +# Similar, for later GCC stages. +POSTSTAGE1_TARGET_EXPORTS = \ + $(POSTSTAGE1_RPATH_EXPORT) + # Where to find GMP HOST_GMPLIBS = @gmplibs@ HOST_GMPINC = @gmpinc@ @@ -535,6 +547,10 @@ all: TARGET_LIB_PATH = [+ FOR target_modules +][+ IF lib_path +]$(TARGET_LIB_PATH_[+module+])[+ ENDIF lib_path +][+ ENDFOR target_modules +]$(HOST_LIB_PATH_gcc) +# Use the build rather than the target libstdc++ +TARGET_LIB_PATH_BUILD_LIBSTDC++ = [+ FOR target_modules +][+ + IF lib_path +][+ IF (not (= (get "module") "libstdc++-v3")) +]$(TARGET_LIB_PATH_[+module+])[+ ENDIF +][+ ENDIF lib_path +][+ + ENDFOR target_modules +]$(HOST_LIB_PATH_gcc) [+ FOR target_modules +][+ IF lib_path +] @if target-[+module+] TARGET_LIB_PATH_[+module+] = $$r/$(TARGET_SUBDIR)/[+module+]/[+lib_path+]: @@ -1323,6 +1339,7 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+] [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" check_multilibs=true exports="$(RAW_CXX_TARGET_EXPORTS)" + poststage1_exports="$(POSTSTAGE1_TARGET_EXPORTS)" host_alias=(get "host" "${target_alias}") target_alias=(get "target" "${target_alias}") args="$(TARGET_CONFIGARGS)" no-config-site=true +] @@ -1334,6 +1351,7 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+] [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" check_multilibs=true exports="$(NORMAL_TARGET_EXPORTS)" + poststage1_exports="$(POSTSTAGE1_TARGET_EXPORTS)" host_alias=(get "host" "${target_alias}") target_alias=(get "target" "${target_alias}") args="$(TARGET_CONFIGARGS)" no-config-site=true +]
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
