From patchwork Thu Nov 15 11:57:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 199261 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 094C62C0372 for ; Thu, 15 Nov 2012 22:58:06 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1353585487; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=em5WVnvdqRFHhwGc5JOYIchR8d8=; b=ThIBgyyeyf+mJ9x 2XGtikmas6Z2puBuWWMm34d1WqcGHT1TcOFwM0q0OQUcJXD1ZX0iQ/teuezt9ET9 XjbK8zE1NfCxPxR1Are9qMfzH1Fw4frUe/eqSDXq6GEGZKTPiNCjEauHlrdlc3vI GuRF2W7TYn8YhIiHjwjudubgc7Tk= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=SVCwMP8J8KWDFbzTa5JYrr5CsvehwDdHKhwwWufbJcAw2Os3YKnwW+pN7+kLgM 6YsEtiKJtTLTg2+L0capCIz1TypypirgoAMSoAQCMU4nMunHMtyRRSTfOUXgAbIi mDdMOmR/PCv97CbocOCA5DeQTT2cNydMxu/J/GG8jFuBI=; Received: (qmail 17261 invoked by alias); 15 Nov 2012 11:58:03 -0000 Received: (qmail 17253 invoked by uid 22791); 15 Nov 2012 11:58:02 -0000 X-SWARE-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 15 Nov 2012 11:57:56 +0000 Received: from dslb-088-073-075-253.pools.arcor-ip.net ([88.73.75.253] helo=[192.168.42.216]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1TYy4w-0007Zv-Ix; Thu, 15 Nov 2012 11:57:54 +0000 Message-ID: <50A4D8BF.2030202@ubuntu.com> Date: Thu, 15 Nov 2012 12:57:51 +0100 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Eric Botcazou CC: gcc-patches@gcc.gnu.org, "Joseph S. Myers" , Paolo Bonzini , Thomas Schwinge Subject: Re: [ping] Re: [patch v2] support for multiarch systems References: <4E501045.40102@ubuntu.com> <4FF9D5F7.6090505@ubuntu.com> <5020EE69.4020102@ubuntu.com> <3564821.ReIG3shhQT@polaris> In-Reply-To: <3564821.ReIG3shhQT@polaris> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Am 15.11.2012 12:41, schrieb Eric Botcazou: >> re-attaching the updated patch with the fixed comment in genmultilib. > > This has introduced: > > make[3]: Leaving directory `/red.a/gnatmail/gcc-x/build-red/x86_64- > linux/gnat/obj/libdecnumber' > make[3]: Entering directory `/red.a/gnatmail/gcc-x/build-red/x86_64- > linux/gnat/obj/gcc' > Makefile:538: Extraneous text after `else' directive > Makefile:541: *** only one `else' per conditional. Stop. ahh, this is with GNU make 3.80. Checked in the following patch as obvious. Matthias 2012-11-15 Matthias Klose * Makefile.in (if_multiarch): Don't use a GNU make 3.81 feature. Index: Makefile.in =================================================================== --- Makefile.in (Revision 193528) +++ Makefile.in (Arbeitskopie) @@ -535,11 +535,13 @@ with_float = @with_float@ ifeq ($(enable_multiarch),yes) if_multiarch = $(1) -else ifeq ($(enable_multiarch),auto) - # SYSTEM_HEADER_DIR is makefile syntax, cannot be evaluated in configure.ac - if_multiarch = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib/*/crti.o),$(1)) else - if_multiarch = + ifeq ($(enable_multiarch),auto) + # SYSTEM_HEADER_DIR is makefile syntax, cannot be evaluated in configure.ac + if_multiarch = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib/*/crti.o),$(1)) + else + if_multiarch = + endif endif # ------------------------