From patchwork Tue May 20 14:59:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 350747 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 74FE7140083 for ; Wed, 21 May 2014 01:00:02 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :content-transfer-encoding:in-reply-to; q=dns; s=default; b=d630 Hvl6JosnJBLrToW/qyG6rhyds14WS07MlRlXRKHkz0Fdb5ypfSrfRl8UsHLYbkv4 SYp3fqSWKCL38hnmlRqJca6HvjAuK5ntg2kFFP7oHNbMVIZsXOFBMjGQQM3xq7fs QHHgF3RZFqsULueDnv6SH6AE2QLBEFvR3pUdoAk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :content-transfer-encoding:in-reply-to; s=default; bh=ebF8RP2Drj vuHJjvQy6RE6+sgPw=; b=fqo5QH1VXz8ZlGJY2Ym8QbNSPXCPbqxVX67Nl0mLWH lUpjqMV0ugMtxC1qVGmyINK7SJS6usV4egz2xgPvH9LMO1nkbVleaKYt6c5QfrWu W+CbnQCSwg4ScQiB9mzcNyVu6F5PGnugM+K8gvs1ANBMJyKSxwbqFeOgUEUdjm/S Y= Received: (qmail 13350 invoked by alias); 20 May 2014 14:59:55 -0000 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 Received: (qmail 13318 invoked by uid 89); 20 May 2014 14:59:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 20 May 2014 14:59:53 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4KExqkU024073 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 May 2014 10:59:52 -0400 Received: from localhost (vpn1-7-54.ams2.redhat.com [10.36.7.54]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s4KExp9X001286; Tue, 20 May 2014 10:59:52 -0400 Date: Tue, 20 May 2014 15:59:50 +0100 From: Jonathan Wakely To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Re: [patch] libstdc++/61011 fix --disable-libstdcxx in top-level configure Message-ID: <20140520145950.GP29145@redhat.com> References: <20140520145313.GO29145@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140520145313.GO29145@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) On 20/05/14 15:53 +0100, Jonathan Wakely wrote: >The first part of this patch fixes the PR, we should be adding >target-libstdc++-v3 to noconfigdirs, not libstdc++-v3. > >The second part disables the target libs that can't be bootstrapped >without libstdc++. > >libcilkrts and libsanitizer use lots of std:: stuff. >libitm only uses std::atomic, but in any case fails to build when >--disable-libstdcxx is used, with this error: > >xg++: error: unrecognized command line option ‘-funconfigured-libstdc++-v3’ > >Bootstrapped with and without --disable-libstdcxx and tested on >x86_64-linux. > > PR libstdc++/61011 > * configure.ac (--disable-libstdcxx): Set noconfigdirs correctly. > Disable libcilkrts, libitm, libsanitizer when not building libstdc++. > * configure: Regenerate. > >OK for trunk? With the patch this time ... commit c384fef85bca43046b65eb02267169a5613af2b8 Author: Jonathan Wakely Date: Tue May 20 12:13:43 2014 +0100 PR libstdc++/61011 * configure.ac (--disable-libstdcxx): Set noconfigdirs correctly. Disable libcilkrts, libitm, libsanitizer when not building libstdc++. * configure: Regenerate. diff --git a/configure.ac b/configure.ac index 07c3a66..548525b 100644 --- a/configure.ac +++ b/configure.ac @@ -435,7 +435,7 @@ AS_HELP_STRING([--disable-libstdcxx], ENABLE_LIBSTDCXX=$enableval, ENABLE_LIBSTDCXX=default) [if test "${ENABLE_LIBSTDCXX}" = "no" ; then - noconfigdirs="$noconfigdirs libstdc++-v3" + noconfigdirs="$noconfigdirs target-libstdc++-v3" fi] # Save it here so that, even in case of --enable-libgcj, if the Java @@ -2057,9 +2057,17 @@ case ,${enable_languages},:${enable_objc_gc} in ;; esac -# Disable libitm, libsanitizer, libvtv if we're not building C++ +# Disable libcilkrts, libitm, libsanitizer, libvtv if we're not building C++ case ,${enable_languages}, in - *,c++,*) ;; + *,c++,*) + # Disable libcilkrts, libitm, libsanitizer if we're not building libstdc++ + case "${noconfigdirs}" in + *target-libstdc++-v3*) + noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer" + ;; + *) ;; + esac + ;; *) noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer target-libvtv" ;;