|
yann@2149
|
1 |
ChangeLog:
|
|
yann@2149
|
2 |
2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
yann@2149
|
3 |
|
|
yann@2149
|
4 |
PR bootstrap/41818
|
|
yann@2149
|
5 |
* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
|
|
yann@2149
|
6 |
to $(RPATH_ENVVAR) if bootstrapping.
|
|
yann@2149
|
7 |
* Makefile.in: Regenerate.
|
|
yann@2149
|
8 |
|
|
yann@2149
|
9 |
diff -durN gcc-4.4.5.orig/Makefile.in gcc-4.4.5/Makefile.in
|
|
yann@2149
|
10 |
--- gcc-4.4.5.orig/Makefile.in 2009-04-25 06:10:29.000000000 +0200
|
|
yann@2149
|
11 |
+++ gcc-4.4.5/Makefile.in 2010-10-09 23:13:50.000000000 +0200
|
|
yann@2149
|
12 |
@@ -245,7 +245,10 @@
|
|
yann@2149
|
13 |
STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
|
|
yann@2149
|
14 |
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
|
|
yann@2149
|
15 |
WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
|
|
yann@2149
|
16 |
- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
|
|
yann@2149
|
17 |
+@if gcc-bootstrap
|
|
yann@2149
|
18 |
+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
|
yann@2149
|
19 |
+@endif gcc-bootstrap
|
|
yann@2149
|
20 |
+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
|
|
yann@2149
|
21 |
|
|
yann@2149
|
22 |
RAW_CXX_TARGET_EXPORTS = \
|
|
yann@2149
|
23 |
$(BASE_TARGET_EXPORTS) \
|
|
yann@2149
|
24 |
diff -durN gcc-4.4.5.orig/Makefile.tpl gcc-4.4.5/Makefile.tpl
|
|
yann@2149
|
25 |
--- gcc-4.4.5.orig/Makefile.tpl 2009-04-14 10:57:33.000000000 +0200
|
|
yann@2149
|
26 |
+++ gcc-4.4.5/Makefile.tpl 2010-10-09 23:13:50.000000000 +0200
|
|
yann@2149
|
27 |
@@ -248,7 +248,10 @@
|
|
yann@2149
|
28 |
STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
|
|
yann@2149
|
29 |
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
|
|
yann@2149
|
30 |
WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
|
|
yann@2149
|
31 |
- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
|
|
yann@2149
|
32 |
+@if gcc-bootstrap
|
|
yann@2149
|
33 |
+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
|
yann@2149
|
34 |
+@endif gcc-bootstrap
|
|
yann@2149
|
35 |
+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
|
|
yann@2149
|
36 |
|
|
yann@2149
|
37 |
RAW_CXX_TARGET_EXPORTS = \
|
|
yann@2149
|
38 |
$(BASE_TARGET_EXPORTS) \
|