diff options
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index d685c39..06ea94a 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -104,6 +104,7 @@ SET_LIB_PATH = @SET_LIB_PATH@ # Some platforms don't like blank entries, so we remove duplicate, # leading and trailing colons. REALLY_SET_LIB_PATH = \ + @SET_GCC_LIB_PATH@ \ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); # This is the list of directories to be built for the build system. @@ -173,7 +174,9 @@ HOST_EXPORTS = \ OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \ TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \ - GMPINC="$(HOST_GMPINC)"; export GMPINC; + GMPINC="$(HOST_GMPINC)"; export GMPINC; \ + SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \ + @SET_GCC_LIB_PATH@ # Similar, for later GCC stages. STAGE_HOST_EXPORTS = \ @@ -207,7 +210,9 @@ BASE_TARGET_EXPORTS = \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ NM="$(NM_FOR_TARGET)"; export NM; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ - WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ + SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \ + @SET_GCC_LIB_PATH@ RAW_CXX_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ |