aboutsummaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-01-07 20:00:52 +0000
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-01-07 20:00:52 +0000
commitf2b2dd913f26435c8dc567a4116f49967f35df79 (patch)
tree184e0eac1e79f87e00f85509672b10069c57a751 /Makefile.tpl
parent659948a49877c238eecbd5117a8651a897496810 (diff)
downloadfsf-binutils-gdb-f2b2dd913f26435c8dc567a4116f49967f35df79.zip
fsf-binutils-gdb-f2b2dd913f26435c8dc567a4116f49967f35df79.tar.gz
fsf-binutils-gdb-f2b2dd913f26435c8dc567a4116f49967f35df79.tar.bz2
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.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r--Makefile.tpl7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index 15102e5..ac62666 100644
--- 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) \