summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2010-01-07 19:53:50 +0000
committerrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2010-01-07 19:53:50 +0000
commit1ab7bcf02aec0709662deff6e2d9910070ef00d6 (patch)
tree0ac4f16657f5528b5b43ef17f515def666f230e4 /Makefile.in
parentbeb8be281281825b184e0e987dd239d1708fbb50 (diff)
downloadgcc-1ab7bcf02aec0709662deff6e2d9910070ef00d6.tar.gz
Fix PR bootstrap/41818.
/: 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155706 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index e5fa1d3a0f0..6f1c1403fbb 100644
--- 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) \