| author | "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
| Fri Oct 08 23:37:12 2010 +0200 (2010-10-08) | |
| branch | 1.8 |
| changeset 2150 | f97a8ad2b172 |
| permissions | -rw-r--r-- |
| yann@1948 | 1 |
ChangeLog: |
| yann@1948 | 2 |
2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
| yann@1948 | 3 |
|
| yann@1948 | 4 |
PR bootstrap/41818 |
| yann@1948 | 5 |
* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH |
| yann@1948 | 6 |
to $(RPATH_ENVVAR) if bootstrapping. |
| yann@1948 | 7 |
* Makefile.in: Regenerate. |
| yann@1948 | 8 |
|
| yann@1948 | 9 |
diff -durN gcc-4.4.4.orig/Makefile.in gcc-4.4.4/Makefile.in |
| yann@1948 | 10 |
--- gcc-4.4.4.orig/Makefile.in 2009-04-25 06:10:29.000000000 +0200 |
| yann@1948 | 11 |
+++ gcc-4.4.4/Makefile.in 2010-05-16 19:38:17.000000000 +0200 |
| yann@1948 | 12 |
@@ -245,7 +245,10 @@ |
| yann@1948 | 13 |
STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ |
| yann@1948 | 14 |
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ |
| yann@1948 | 15 |
WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ |
| yann@1948 | 16 |
- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); |
| yann@1948 | 17 |
+@if gcc-bootstrap |
| yann@1948 | 18 |
+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ |
| yann@1948 | 19 |
+@endif gcc-bootstrap |
| yann@1948 | 20 |
+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); |
| yann@1948 | 21 |
|
| yann@1948 | 22 |
RAW_CXX_TARGET_EXPORTS = \ |
| yann@1948 | 23 |
$(BASE_TARGET_EXPORTS) \ |
| yann@1948 | 24 |
diff -durN gcc-4.4.4.orig/Makefile.tpl gcc-4.4.4/Makefile.tpl |
| yann@1948 | 25 |
--- gcc-4.4.4.orig/Makefile.tpl 2009-04-14 10:57:33.000000000 +0200 |
| yann@1948 | 26 |
+++ gcc-4.4.4/Makefile.tpl 2010-05-16 19:38:17.000000000 +0200 |
| yann@1948 | 27 |
@@ -248,7 +248,10 @@ |
| yann@1948 | 28 |
STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ |
| yann@1948 | 29 |
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ |
| yann@1948 | 30 |
WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ |
| yann@1948 | 31 |
- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); |
| yann@1948 | 32 |
+@if gcc-bootstrap |
| yann@1948 | 33 |
+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ |
| yann@1948 | 34 |
+@endif gcc-bootstrap |
| yann@1948 | 35 |
+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); |
| yann@1948 | 36 |
|
| yann@1948 | 37 |
RAW_CXX_TARGET_EXPORTS = \ |
| yann@1948 | 38 |
$(BASE_TARGET_EXPORTS) \ |