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

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

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

gcc/ChangeLog

 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>

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) \