summaryrefslogtreecommitdiff
path: root/patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch')
-rw-r--r--patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch
new file mode 100644
index 0000000..84f62d4
--- /dev/null
+++ b/patches/gcc/4.4.6/370-bootstrap-target_lib_path.patch
@@ -0,0 +1,38 @@
+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 -durN gcc-4.4.5.orig/Makefile.in gcc-4.4.5/Makefile.in
+--- gcc-4.4.5.orig/Makefile.in 2009-04-25 06:10:29.000000000 +0200
++++ gcc-4.4.5/Makefile.in 2010-10-09 23:13:50.000000000 +0200
+@@ -245,7 +245,10 @@
+ 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 -durN gcc-4.4.5.orig/Makefile.tpl gcc-4.4.5/Makefile.tpl
+--- gcc-4.4.5.orig/Makefile.tpl 2009-04-14 10:57:33.000000000 +0200
++++ gcc-4.4.5/Makefile.tpl 2010-10-09 23:13:50.000000000 +0200
+@@ -248,7 +248,10 @@
+ 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) \