This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH] Fix genmatch linking
- From: Richard Biener <rguenther at suse dot de>
- To: Rainer Orth <ro at CeBiTec dot Uni-Bielefeld dot DE>
- Cc: gcc-patches at gcc dot gnu dot org, Jakub Jelinek <jakub at redhat dot com>
- Date: Thu, 23 Oct 2014 16:31:36 +0200 (CEST)
- Subject: Re: [PATCH] Fix genmatch linking
- Authentication-results: sourceware.org; auth=none
- References: <alpine dot LSU dot 2 dot 11 dot 1410231046100 dot 9891 at zhemvz dot fhfr dot qr> <ydd7fzrnecy dot fsf at lokon dot CeBiTec dot Uni-Bielefeld dot DE> <alpine dot LSU dot 2 dot 11 dot 1410231455160 dot 9891 at zhemvz dot fhfr dot qr> <alpine dot LSU dot 2 dot 11 dot 1410231602080 dot 9891 at zhemvz dot fhfr dot qr> <alpine dot LSU dot 2 dot 11 dot 1410231606060 dot 9891 at zhemvz dot fhfr dot qr>
Final try for today.
Richard.
Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in (revision 216590)
+++ gcc/Makefile.in (working copy)
@@ -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) $(LIBINTL_DEP) $(LIBICONV_DEP)
+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) \