2 2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
5 * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
6 to $(RPATH_ENVVAR) if bootstrapping.
7 * Makefile.in: Regenerate.
9 diff --git a/Makefile.in b/Makefile.in
10 index e5fa1d3..dbfc1f0 100644
13 @@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
14 STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
15 WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
16 WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
17 - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
19 + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
21 + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
23 RAW_CXX_TARGET_EXPORTS = \
24 $(BASE_TARGET_EXPORTS) \
25 diff --git a/Makefile.tpl b/Makefile.tpl
26 index 15102e5..452d47c 100644
29 @@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
30 STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
31 WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
32 WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
33 - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
35 + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
37 + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
39 RAW_CXX_TARGET_EXPORTS = \
40 $(BASE_TARGET_EXPORTS) \