diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 01f44ec..ee7a0fd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2014-10-24 Richard Biener <rguenther@suse.de> + * Makefile.in (BUILD_CPPLIB): When in stage2+ use the + host library and make sure to pull in the required libintl + and libiconv dependencies. + +2014-10-24 Richard Biener <rguenther@suse.de> + * fold-const.c (fold_binary_loc): Fix copy-and-pasto. 2014-10-24 Markus Trippelsdorf <markus@trippelsdorf.de> diff --git a/gcc/Makefile.in b/gcc/Makefile.in index c44c0fd..b7b3f60 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -981,7 +981,15 @@ else LIBIBERTY = ../libiberty/libiberty.a BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/libiberty.a endif +# For stage1 and when cross-compiling use the build libcpp which is +# built with NLS disabled. For stage2+ use the host library and +# its dependencies. +ifeq ($(build_objdir),$(build_libobjdir)) BUILD_CPPLIB = $(build_libobjdir)/libcpp/libcpp.a +else +BUILD_CPPLIB = $(CPPLIB) $(LIBIBERTY) $(LIBINTL) $(LIBICONV) +build/genmatch$(build_exeext): BUILD_LIBDEPS += $(LIBINTL_DEP) $(LIBICONV_DEP) +endif # Dependencies on the intl and portability libraries. LIBDEPS= libcommon.a $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) \ |