From patchwork Tue Apr 3 10:47:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Reutner-Fischer X-Patchwork-Id: 150382 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 62B4DB6FDE for ; Tue, 3 Apr 2012 20:48:15 +1000 (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=1334054895; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Cc:Subject:Date:Message-Id: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=xKaYrlC3zeQOewRJjuYg JzQociw=; b=nDYC9j2dk8nSh0Jj0z/S6SNBtNHg7lDlICw9dheyXN5pCBpcoXM/ hVoP/7kx+rzuldPT6SACrtrga0/xW4YFPeCddcJMhFclkXcyY43wwq2eHwoCOBn4 JMcEPxCiaULSPBqyaEfvlfVvS0TKg3vkP1Khb+kh8WUmXdIqY+HNVDk= 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:Received:Received:Received:From:To:Cc:Subject:Date:Message-Id:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=GFk1V6PL+fcMagnlM0dUWpaliAugE7ShxF54OZbjL3D/5+vVohWiTCXsX7o0N2 dAOnCpUAqbdgOdMVHd8LrDzeQsLIQnyqETUcw8x6R8sR4c+G7ZiNlmWuDOFPGAez f6D6ClzB+hZ2YBUBR5HAn1fAlRQpLIKZdvtxXIOztkrYc=; Received: (qmail 9728 invoked by alias); 3 Apr 2012 10:48:12 -0000 Received: (qmail 9719 invoked by uid 22791); 3 Apr 2012 10:48:11 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-we0-f175.google.com (HELO mail-we0-f175.google.com) (74.125.82.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 03 Apr 2012 10:47:58 +0000 Received: by wera1 with SMTP id a1so2601821wer.20 for ; Tue, 03 Apr 2012 03:47:57 -0700 (PDT) Received: by 10.180.80.70 with SMTP id p6mr5039696wix.21.1333450077748; Tue, 03 Apr 2012 03:47:57 -0700 (PDT) Received: from s42.loc ([91.119.235.145]) by mx.google.com with ESMTPS id fl2sm67955604wib.4.2012.04.03.03.47.56 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Apr 2012 03:47:56 -0700 (PDT) Received: from cow by s42.loc with local (Exim 4.77) (envelope-from ) id 1SF1HG-0000hJ-Vh; Tue, 03 Apr 2012 12:47:55 +0200 From: Bernhard Reutner-Fischer To: gcc-patches@gcc.gnu.org Cc: Bernhard Reutner-Fischer , Benjamin Kosnik Subject: [PATCH] PR bootstrap/52840: libstdc++: let debug find sources for compatibility.lo Date: Tue, 3 Apr 2012 12:47:53 +0200 Message-Id: <1333450073-2650-1-git-send-email-rep.dot.nop@gmail.com> 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 2012-04-03 Bernhard Reutner-Fischer PR bootstrap/52840 * src/Makefile.am (build-debug): Do not adjust vpath dir, remove Makefile.tmp * src/Makefile.in: Adjust as per above. Signed-off-by: Bernhard Reutner-Fischer --- libstdc++-v3/src/Makefile.am | 3 ++- libstdc++-v3/src/Makefile.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 28430cf..52cf0d5 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -293,8 +293,9 @@ build-debug: stamp-debug mv Makefile Makefile.tmp; \ sed -e 's,all-local: all-once,all-local:,' \ -e 's,install-data-local: install-data-once,install-data-local:,' \ - -e 's,src/c,src/debug/c,' \ + -e '/vpath/!s,src/c,src/debug/c,' \ < Makefile.tmp > Makefile ; \ + rm -f Makefile.tmp ; \ $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ; diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 3c1facf..d211ba9 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -914,8 +914,9 @@ build-debug: stamp-debug mv Makefile Makefile.tmp; \ sed -e 's,all-local: all-once,all-local:,' \ -e 's,install-data-local: install-data-once,install-data-local:,' \ - -e 's,src/c,src/debug/c,' \ + -e '/vpath/!s,src/c,src/debug/c,' \ < Makefile.tmp > Makefile ; \ + rm -f Makefile.tmp ; \ $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ;