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: Fri, 24 Oct 2014 13:06:11 +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> <alpine dot LSU dot 2 dot 11 dot 1410231629460 dot 9891 at zhemvz dot fhfr dot qr> <alpine dot LSU dot 2 dot 11 dot 1410231633010 dot 9891 at zhemvz dot fhfr dot qr> <yddegtxykdq dot fsf at CeBiTec dot Uni-Bielefeld dot DE> <alpine dot LSU dot 2 dot 11 dot 1410240958380 dot 9891 at zhemvz dot fhfr dot qr> <alpine dot LSU dot 2 dot 11 dot 1410241140500 dot 9891 at zhemvz dot fhfr dot qr> <ydd61f920ho dot fsf at CeBiTec dot Uni-Bielefeld dot DE>
On Fri, 24 Oct 2014, Rainer Orth wrote:
> Richard Biener <rguenther@suse.de> writes:
>
> > Dominique reported that this fails for system libiconv but built libintl.
> >
> > Which might be fixed by the following. Does that still work for you?
>
> It does: an i386-pc-solaris2.10 bootstrap has finished by now and make
> check is running.
Dominique reported an ok as well. Bootstrapped myself on
x86_64-unknown-linux-gnu and commited as r216632.
Richard.
2014-10-24 Richard Biener <rguenther@suse.de>
* Makefile.in (BUILD_CPPLIB): Move $(LIBINTL) $(LIBICONV)
to genmatch BUILD_LIBS instead.
Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in (revision 216626)
+++ gcc/Makefile.in (working copy)
@@ -981,15 +981,6 @@ 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) \
@@ -2529,6 +2520,17 @@ genprog = $(genprogerr) check checksum c
# These programs need libs over and above what they get from the above list.
build/genautomata$(build_exeext) : BUILD_LIBS += -lm
+# 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)
+build/genmatch$(build_exeext): BUILD_LIBDEPS += $(LIBINTL_DEP) $(LIBICONV_DEP)
+build/genmatch$(build_exeext): BUILD_LIBS += $(LIBINTL) $(LIBICONV)
+endif
+
build/genmatch$(build_exeext) : $(BUILD_CPPLIB) \
$(BUILD_ERRORS) build/vec.o build/hash-table.o