From patchwork Thu Nov 4 13:08:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joern Rennecke X-Patchwork-Id: 70126 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 E46F61007D2 for ; Fri, 5 Nov 2010 00:08:45 +1100 (EST) Received: (qmail 30980 invoked by alias); 4 Nov 2010 13:08:41 -0000 Received: (qmail 30813 invoked by uid 22791); 4 Nov 2010 13:08:40 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL, BAYES_00, MIME_QP_LONG_LINE, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from c60.cesmail.net (HELO c60.cesmail.net) (216.154.195.49) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 04 Nov 2010 13:08:36 +0000 Received: from unknown (HELO delta2) ([192.168.1.50]) by c60.cesmail.net with ESMTP; 04 Nov 2010 09:08:34 -0400 Received: from 89.241.157.248 ([89.241.157.248]) by webmail.spamcop.net (Horde MIME library) with HTTP; Thu, 04 Nov 2010 09:08:34 -0400 Message-ID: <20101104090834.yzg2549rks8o84wg-nzlynne@webmail.spamcop.net> Date: Thu, 04 Nov 2010 09:08:34 -0400 From: Joern Rennecke To: gcc-patches@gcc.gnu.org Cc: Paolo Bonzini , DJ Delorie , Nathanael Nerode , Alexandre Oliva Subject: Ping: RFA (build): Avoid circular dependency References: <20100629172139.7sxigvan4g48koss-nzlynne@webmail.spamcop.net> In-Reply-To: <20100629172139.7sxigvan4g48koss-nzlynne@webmail.spamcop.net> MIME-Version: 1.0 User-Agent: Internet Messaging Program (IMP) H3 (4.1.4) 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 Quoting Joern Rennecke : > Because of PR44719, I grepped my build log for more odd make messages. > I've found this: > make[3]: Circular s-tm-texi <- ../../gcc/gcc/doc/tm.texi dependency dropped. Ping? This is still relevant as of revision 166238, and the patch also applies cleanly to that version and fixes the issue. See also the discussion in the comments to PR45888. bootstrapped and regtested on i686-pc-linux-gnu. This is an unwanted consequence of having to check in the generated $(srcdir)/doc/tm.texi. Because of vpath, there is confusion between $(srcdir)/doc/tm.texi and tm.texi. By giving tm.texi (the build dir one only) a different name, make can distinguish the files. Currently bootstrapping on i686-pc-linux-gnu. 2010-06-29 Joern Rennecke * Makefile.in (tm.texi): Rename to new-tm.texi. Index: Makefile.in =================================================================== --- Makefile.in (revision 161563) +++ Makefile.in (working copy) @@ -3675,7 +3675,7 @@ s-constrs-h: $(MD_DEPS) build/genpreds$( $(STAMP) s-constrs-h target-hooks-def.h: s-target-hooks-def-h; @true -tm.texi: s-tm-texi; @true +new-tm.texi: s-tm-texi; @true s-target-hooks-def-h: build/genhooks$(build_exeext) $(RUN_GEN) build/genhooks$(build_exeext) > tmp-target-hooks-def.h @@ -3689,8 +3689,8 @@ s-tm-texi: $(srcdir)/doc/tm.texi s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in $(RUN_GEN) build/genhooks$(build_exeext) \ $(srcdir)/doc/tm.texi.in > tmp-tm.texi - $(SHELL) $(srcdir)/../move-if-change tmp-tm.texi tm.texi - @if cmp -s $(srcdir)/doc/tm.texi tm.texi; then \ + $(SHELL) $(srcdir)/../move-if-change tmp-tm.texi new-tm.texi + @if cmp -s $(srcdir)/doc/tm.texi new-tm.texi; then \ $(STAMP) $@; \ elif test $(srcdir)/doc/tm.texi -nt $(srcdir)/doc/tm.texi.in \ && test $(srcdir)/doc/tm.texi -nt $(srcdir)/doc/target.def; then \ @@ -3700,7 +3700,7 @@ s-tm-texi: build/genhooks$(build_exeext) else \ echo >&2 ; \ echo Verify that you have permission to grant a GFDL license for all >&2 ; \ - echo new text in tm.texi, then copy it to $(srcdir)/doc/tm.texi. >&2 ; \ + echo new text in new-tm.texi, then copy it to $(srcdir)/doc/tm.texi. >&2 ; \ false; \ fi @@ -4153,7 +4153,7 @@ TEXI_GCC_FILES = gcc.texi gcc-common.tex TEXI_GCCINT_FILES = gccint.texi gcc-common.texi gcc-vers.texi \ contribute.texi makefile.texi configterms.texi options.texi \ portability.texi interface.texi passes.texi \ - rtl.texi md.texi tm.texi hostconfig.texi fragments.texi \ + rtl.texi md.texi new-tm.texi hostconfig.texi fragments.texi \ configfiles.texi collect2.texi headerdirs.texi funding.texi \ gnu.texi gpl_v3.texi fdl.texi contrib.texi languages.texi \ sourcebuild.texi gty.texi libgcc.texi cfg.texi tree-ssa.texi \