diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-05-18 20:58:49 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-05-18 20:58:49 (GMT) |
commit | 255ff964256cd10050bc34f7a87cc06f3a11ca9b (patch) | |
tree | c6c2139cee5b1bc4cb2ddf9adac471746a18244c /patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch | |
parent | 28c451abe0975805455f88738ab505a8e85e480c (diff) |
Revert changeset d341be24dc68
Arnaud LACOMBE rightly pointed out that this was done on the wrong branch.
Diffstat (limited to 'patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch')
-rw-r--r-- | patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch b/patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch deleted file mode 100644 index 2317e66..0000000 --- a/patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch +++ /dev/null @@ -1,38 +0,0 @@ -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.4.orig/Makefile.in gcc-4.4.4/Makefile.in ---- gcc-4.4.4.orig/Makefile.in 2009-04-25 06:10:29.000000000 +0200 -+++ gcc-4.4.4/Makefile.in 2010-05-16 19:38:17.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.4.orig/Makefile.tpl gcc-4.4.4/Makefile.tpl ---- gcc-4.4.4.orig/Makefile.tpl 2009-04-14 10:57:33.000000000 +0200 -+++ gcc-4.4.4/Makefile.tpl 2010-05-16 19:38:17.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) \ |