| 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) \ |
