yann@1948: ChangeLog:
yann@1948: 2010-01-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
yann@1948: 
yann@1948: 	PR bootstrap/41818
yann@1948: 	* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
yann@1948: 	to $(RPATH_ENVVAR) if bootstrapping.
yann@1948: 	* Makefile.in: Regenerate.
yann@1948: 
yann@1948: diff -durN gcc-4.4.4.orig/Makefile.in gcc-4.4.4/Makefile.in
yann@1948: --- gcc-4.4.4.orig/Makefile.in	2009-04-25 06:10:29.000000000 +0200
yann@1948: +++ gcc-4.4.4/Makefile.in	2010-05-16 19:38:17.000000000 +0200
yann@1948: @@ -245,7 +245,10 @@
yann@1948:  	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
yann@1948:  	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
yann@1948:  	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
yann@1948: -	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
yann@1948: +@if gcc-bootstrap
yann@1948: +	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
yann@1948: +@endif gcc-bootstrap
yann@1948: +	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
yann@1948:  
yann@1948:  RAW_CXX_TARGET_EXPORTS = \
yann@1948:  	$(BASE_TARGET_EXPORTS) \
yann@1948: diff -durN gcc-4.4.4.orig/Makefile.tpl gcc-4.4.4/Makefile.tpl
yann@1948: --- gcc-4.4.4.orig/Makefile.tpl	2009-04-14 10:57:33.000000000 +0200
yann@1948: +++ gcc-4.4.4/Makefile.tpl	2010-05-16 19:38:17.000000000 +0200
yann@1948: @@ -248,7 +248,10 @@
yann@1948:  	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
yann@1948:  	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
yann@1948:  	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
yann@1948: -	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
yann@1948: +@if gcc-bootstrap
yann@1948: +	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
yann@1948: +@endif gcc-bootstrap
yann@1948: +	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
yann@1948:  
yann@1948:  RAW_CXX_TARGET_EXPORTS = \
yann@1948:  	$(BASE_TARGET_EXPORTS) \