From b0f5e5ad6f54d61d333ef882cef2981619c21f86 Mon Sep 17 00:00:00 2001 From: rguenth Date: Fri, 24 Oct 2014 08:04:25 +0000 Subject: [PATCH] 2014-10-24 Richard Biener * Makefile.in (BUILD_CPPLIB): When in stage2+ use the host library and make sure to pull in the required libintl and libiconv dependencies. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216619 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/Makefile.in | 8 ++++++++ 2 files changed, 14 insertions(+) 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 + * 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 + * fold-const.c (fold_binary_loc): Fix copy-and-pasto. 2014-10-24 Markus Trippelsdorf 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) \ -- 2.7.4