patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch
branch1.7
changeset 1948 d341be24dc68
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch	Sun May 16 19:41:53 2010 +0200
     1.3 @@ -0,0 +1,38 @@
     1.4 +ChangeLog:
     1.5 +2010-01-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
     1.6 +
     1.7 +	PR bootstrap/41818
     1.8 +	* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
     1.9 +	to $(RPATH_ENVVAR) if bootstrapping.
    1.10 +	* Makefile.in: Regenerate.
    1.11 +
    1.12 +diff -durN gcc-4.4.4.orig/Makefile.in gcc-4.4.4/Makefile.in
    1.13 +--- gcc-4.4.4.orig/Makefile.in	2009-04-25 06:10:29.000000000 +0200
    1.14 ++++ gcc-4.4.4/Makefile.in	2010-05-16 19:38:17.000000000 +0200
    1.15 +@@ -245,7 +245,10 @@
    1.16 + 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
    1.17 + 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
    1.18 + 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
    1.19 +-	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    1.20 ++@if gcc-bootstrap
    1.21 ++	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
    1.22 ++@endif gcc-bootstrap
    1.23 ++	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    1.24 + 
    1.25 + RAW_CXX_TARGET_EXPORTS = \
    1.26 + 	$(BASE_TARGET_EXPORTS) \
    1.27 +diff -durN gcc-4.4.4.orig/Makefile.tpl gcc-4.4.4/Makefile.tpl
    1.28 +--- gcc-4.4.4.orig/Makefile.tpl	2009-04-14 10:57:33.000000000 +0200
    1.29 ++++ gcc-4.4.4/Makefile.tpl	2010-05-16 19:38:17.000000000 +0200
    1.30 +@@ -248,7 +248,10 @@
    1.31 + 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
    1.32 + 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
    1.33 + 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
    1.34 +-	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    1.35 ++@if gcc-bootstrap
    1.36 ++	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
    1.37 ++@endif gcc-bootstrap
    1.38 ++	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    1.39 + 
    1.40 + RAW_CXX_TARGET_EXPORTS = \
    1.41 + 	$(BASE_TARGET_EXPORTS) \