Sync from GCC: Makefile.tpl (BASE_TARGET_EXPORTS) fix

/:
	PR bootstrap/41818
	* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
	to $(RPATH_ENVVAR) if bootstrapping.  Fix typo in comment.
	* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index cec0ccb2fef4cd6e8331e2777869ed1c4505c3df..512d894812c3bf6ad996f711c0d91203391ef5c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       PR bootstrap/41818
+       * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
+       to $(RPATH_ENVVAR) if bootstrapping.  Fix typo in comment.
+       * Makefile.in: Regenerate.
+
 2009-12-18  Ben Elliston  <bje@au.ibm.com>
 
        * config.sub, config.guess: Update from upstream sources.

diff --git a/Makefile.in b/Makefile.in
index e5fa1d3a0f0fa4760c6f95cc4f80da7d2821f58e..6f1c1403fbb04f40d586793c73800a6f4b4af268 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,7 +259,7 @@ TARGET_SUBDIR = @target_subdir@
 # directories built for the target.
 TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
 # This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.
+# configuring subdirectories for the target system.
 BASE_TARGET_EXPORTS = \
        $(BASE_EXPORTS) \
        AR="$(AR_FOR_TARGET)"; export AR; \
@@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
        STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
        WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
        WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-       $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+@if gcc-bootstrap
+       $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(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);
 
 RAW_CXX_TARGET_EXPORTS = \
        $(BASE_TARGET_EXPORTS) \

diff --git a/Makefile.tpl b/Makefile.tpl
index 15102e58f676b2a809ef5514c5688f67195e8f0c..ac62666d073d07cf47aa28aaa60073f71e980d05 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -262,7 +262,7 @@ TARGET_SUBDIR = @target_subdir@
 # directories built for the target.
 TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
 # This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.
+# configuring subdirectories for the target system.
 BASE_TARGET_EXPORTS = \
        $(BASE_EXPORTS) \
        AR="$(AR_FOR_TARGET)"; export AR; \
@@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
        STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
        WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
        WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-       $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+@if gcc-bootstrap
+       $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(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);
 
 RAW_CXX_TARGET_EXPORTS = \
        $(BASE_TARGET_EXPORTS) \