summaryrefslogtreecommitdiff
path: root/patches/gcc/4.4.0
diff options
context:
space:
mode:
Diffstat (limited to 'patches/gcc/4.4.0')
-rw-r--r--patches/gcc/4.4.0/370-bootstrap-target_lib_path.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/patches/gcc/4.4.0/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.0/370-bootstrap-target_lib_path.patch
new file mode 100644
index 0000000..7a71d2d
--- /dev/null
+++ b/patches/gcc/4.4.0/370-bootstrap-target_lib_path.patch
@@ -0,0 +1,40 @@
+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) \