From patchwork Fri Nov 15 18:26:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 291650 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EEFFB2C0119 for ; Sat, 16 Nov 2013 05:27:53 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; q=dns; s= default; b=A8p7m4jmnHXU2AY+n0i69GOGnafPOdzMeHWVyKJRrZPBdIMl73hWS kHeJ9JxtdTV5gWeS/iAan6Dl8ho4z0hJQB/4a4s/OIAS027fYB403FHX9kSWGOZT 7vBTvfgiEj6wDSdDR2w/wyn6U+2ktiuNlep2vBGyS42FJ6oo+Bte5A= 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:from :to:subject:date:message-id:mime-version:content-type; s= default; bh=sJuXeeZHMyueQlmJkZTuvQ3oMYo=; b=Dpg1XVxAswDSU3kX61FC /4iVIBzvUVwT+nOTEinB842zFnJ9w5STS1AxFFYK8gWKSeAmKsdMKTcp7BLTfkS/ 65SMwHrYvNAyd2TlIphvMN0zAKnd2JvBe3gvi8Ch61Qo0j9EP0oRlWIOFdIWGfRN pWuin8LFIc3TkvutRRj2GTU= Received: (qmail 21340 invoked by alias); 15 Nov 2013 18:27:23 -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 21230 invoked by uid 89); 15 Nov 2013 18:27:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_50, RDNS_NONE, SPF_HELO_PASS, SPF_PASS, URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from Unknown (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 15 Nov 2013 18:26:30 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAFIQMUv002680 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 15 Nov 2013 13:26:22 -0500 Received: from barimba (ovpn-113-124.phx2.redhat.com [10.3.113.124]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rAFIQJxQ009471 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 15 Nov 2013 13:26:19 -0500 From: Tom Tromey To: gcc-patches@gcc.gnu.org Subject: RFA: fix PR bootstrap/58572 Date: Fri, 15 Nov 2013 11:26:18 -0700 Message-ID: <87a9h5ttbp.fsf@fleche.redhat.com> MIME-Version: 1.0 PR bootstrap/58572 was inadvertently caused by the automatic dependency patch series. The symptoms are that "make bootstrap-lean" will cause a subsequent "make install" to fail. The bug is that the automatic dependency code is picking up in-tree dependencies that were omitted by the old manual dependency tracking. You can see this by grepping for "libstdc" in $build/gcc/.deps/*. However, the "compare" step of "make bootstrap-lean" removes the previous build tree. This causes these dependencies to be unresolved, and "make" thinks that the objects need to be rebuilt. This rebuild is done with the system compiler, causing errors. This patch fixes the bug by removing the previous-stage-removal code from the top-level "compare" target. Tested by "make boostrap-clean; make install". Let me know what you think. Tom 2013-11-15 Tom Tromey PR bootstrap/58572: * Makefile.in: Rebuild. * Makefile.tpl ([+compare-target+]): Don't remove previous stage. diff --git a/Makefile.in b/Makefile.in index f9e8e0d..a5e0583 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,8 @@ # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +# 2010, 2011, 2013 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -45292,10 +45293,6 @@ compare: echo Comparison successful.; \ fi ; \ $(STAMP) compare - if $(LEAN); then \ - rm -rf stage2-*; \ - $(STAMP) stage2-lean; \ - fi @@ -45666,10 +45663,6 @@ compare3: echo Comparison successful.; \ fi ; \ $(STAMP) compare3 - if $(LEAN); then \ - rm -rf stage3-*; \ - $(STAMP) stage3-lean; \ - fi diff --git a/Makefile.tpl b/Makefile.tpl index 92f3f61..bb137ed 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -6,7 +6,8 @@ in # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +# 2010, 2011, 2013 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -1605,11 +1606,7 @@ do-clean: clean-stage[+id+] else \ echo Comparison successful.; \ fi ; \ - $(STAMP) [+compare-target+][+ IF prev +] - if $(LEAN); then \ - rm -rf stage[+prev+]-*; \ - $(STAMP) stage[+prev+]-lean; \ - fi[+ ENDIF prev +] + $(STAMP) [+compare-target+] [+ ENDIF compare-target +] [+ IF bootstrap-target +]