1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/gcc/4.4.2/370-bootstrap-target_lib_path.patch	Wed Jan 06 23:25:08 2010 +0100
     1.3 @@ -0,0 +1,40 @@
     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 --git a/Makefile.in b/Makefile.in
    1.13 +index e5fa1d3..dbfc1f0 100644
    1.14 +--- a/Makefile.in
    1.15 ++++ b/Makefile.in
    1.16 +@@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
    1.17 + 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
    1.18 + 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
    1.19 + 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
    1.20 +-	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    1.21 ++@if gcc-bootstrap
    1.22 ++	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
    1.23 ++@endif gcc-bootstrap
    1.24 ++	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    1.25 + 
    1.26 + RAW_CXX_TARGET_EXPORTS = \
    1.27 + 	$(BASE_TARGET_EXPORTS) \
    1.28 +diff --git a/Makefile.tpl b/Makefile.tpl
    1.29 +index 15102e5..452d47c 100644
    1.30 +--- a/Makefile.tpl
    1.31 ++++ b/Makefile.tpl
    1.32 +@@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
    1.33 + 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
    1.34 + 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
    1.35 + 	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
    1.36 +-	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    1.37 ++@if gcc-bootstrap
    1.38 ++	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
    1.39 ++@endif gcc-bootstrap
    1.40 ++	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
    1.41 + 
    1.42 + RAW_CXX_TARGET_EXPORTS = \
    1.43 + 	$(BASE_TARGET_EXPORTS) \