Makefile.in (BUILD_CPPLIB): When in stage2+ use the host library and make sure to...

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.

From-SVN: r216619

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01f44ecaca0c57a2a3823768f66444cdbbbb3a9b..ee7a0fd0c1a55a0087673d1ad9723ada6765a2f6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index c44c0fd6cf0c443f40bc1204bd7afb04982386cf..b7b3f600a76b89ea2a2b214218024f08fa1768b0 100644 (file)
--- 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) \