From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-381638-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 848 invoked by alias); 23 Oct 2014 14:35:48 -0000
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Received: (qmail 836 invoked by uid 89); 23 Oct 2014 14:35:48 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.2
X-HELO: mx2.suse.de
Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Thu, 23 Oct 2014 14:35:44 +0000
Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254])	by mx2.suse.de (Postfix) with ESMTP id 013A8ABA5;	Thu, 23 Oct 2014 14:35:41 +0000 (UTC)
Date: Thu, 23 Oct 2014 14:37:00 -0000
From: Richard Biener <rguenther@suse.de>
To: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
cc: gcc-patches@gcc.gnu.org, Jakub Jelinek <jakub@redhat.com>
Subject: Re: [PATCH] Fix genmatch linking
In-Reply-To: <alpine.LSU.2.11.1410231606060.9891@zhemvz.fhfr.qr>
Message-ID: <alpine.LSU.2.11.1410231629460.9891@zhemvz.fhfr.qr>
References: <alpine.LSU.2.11.1410231046100.9891@zhemvz.fhfr.qr> <ydd7fzrnecy.fsf@lokon.CeBiTec.Uni-Bielefeld.DE> <alpine.LSU.2.11.1410231455160.9891@zhemvz.fhfr.qr> <alpine.LSU.2.11.1410231602080.9891@zhemvz.fhfr.qr> <alpine.LSU.2.11.1410231606060.9891@zhemvz.fhfr.qr>
User-Agent: Alpine 2.11 (LSU 23 2013-08-11)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-SW-Source: 2014-10/txt/msg02413.txt.bz2


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