yann@1698: ChangeLog:
yann@1698: 2010-01-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
yann@1698: 
yann@1698: 	PR bootstrap/41818
yann@1698: 	* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
yann@1698: 	to $(RPATH_ENVVAR) if bootstrapping.
yann@1698: 	* Makefile.in: Regenerate.
yann@1698: 
yann@1698: diff --git a/Makefile.in b/Makefile.in
yann@1698: index e5fa1d3..dbfc1f0 100644
yann@1698: --- a/Makefile.in
yann@1698: +++ b/Makefile.in
yann@1698: @@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
yann@1698:  	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
yann@1698:  	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
yann@1698:  	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
yann@1698: -	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
yann@1698: +@if gcc-bootstrap
yann@1698: +	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
yann@1698: +@endif gcc-bootstrap
yann@1698: +	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
yann@1698:  
yann@1698:  RAW_CXX_TARGET_EXPORTS = \
yann@1698:  	$(BASE_TARGET_EXPORTS) \
yann@1698: diff --git a/Makefile.tpl b/Makefile.tpl
yann@1698: index 15102e5..452d47c 100644
yann@1698: --- a/Makefile.tpl
yann@1698: +++ b/Makefile.tpl
yann@1698: @@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
yann@1698:  	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
yann@1698:  	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
yann@1698:  	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
yann@1698: -	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
yann@1698: +@if gcc-bootstrap
yann@1698: +	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
yann@1698: +@endif gcc-bootstrap
yann@1698: +	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
yann@1698:  
yann@1698:  RAW_CXX_TARGET_EXPORTS = \
yann@1698:  	$(BASE_TARGET_EXPORTS) \