mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-22 22:22:23 +00:00
e0c928517f
Patch from Ralf Wildenhues: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818#c5 Testing thanks to Joachim Nilsson: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818#c7
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
ChangeLog:
|
|
2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
|
|
PR bootstrap/41818
|
|
* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
|
|
to $(RPATH_ENVVAR) if bootstrapping.
|
|
* Makefile.in: Regenerate.
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index e5fa1d3..dbfc1f0 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -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 15102e5..452d47c 100644
|
|
--- a/Makefile.tpl
|
|
+++ b/Makefile.tpl
|
|
@@ -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) \
|