diff options
| author | Richard Biener <rguenther@suse.de> | 2014-10-24 08:04:25 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2014-10-24 08:04:25 +0000 |
| commit | ef1ea28c3ce49265644432679fddf777b0176df6 (patch) | |
| tree | e39211d25d32d28a02a9720138d96bb136a274cf /gcc/Makefile.in | |
| parent | 4cf03f689795a7d4ec6138ceb47247571ce029d6 (diff) | |
| download | gcc-ef1ea28c3ce49265644432679fddf777b0176df6.zip gcc-ef1ea28c3ce49265644432679fddf777b0176df6.tar.gz gcc-ef1ea28c3ce49265644432679fddf777b0176df6.tar.bz2 | |
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
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 8 |
1 files changed, 8 insertions, 0 deletions
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) \ |