From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 960BF3857017 for ; Thu, 16 Sep 2021 22:09:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 960BF3857017 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-493-pQHJKlJpN7C8Bac6gftBeg-1; Thu, 16 Sep 2021 18:09:07 -0400 X-MC-Unique: pQHJKlJpN7C8Bac6gftBeg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C93611084681; Thu, 16 Sep 2021 22:09:06 +0000 (UTC) Received: from localhost (unknown [10.33.36.240]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72DB119C79; Thu, 16 Sep 2021 22:09:06 +0000 (UTC) Date: Thu, 16 Sep 2021 23:09:05 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Regenerate the src/debug Makefiles as needed Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="BmJfInztmbVwmg6C" Content-Disposition: inline X-Spam-Status: No, score=-14.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2021 22:09:10 -0000 --BmJfInztmbVwmg6C Content-Type: text/plain; charset=us-ascii Content-Disposition: inline When the build configuration changes and Makefiles are recreated, the src/debug/Makefile and src/debug/*/Makefile files are not recreated, because they're not managed in the usual way by automake. This can lead to build failures or surprising inconsistencies between the main and debug versions of the library when doing incremental builds. This causes them to be regenerated if any of the corresponding non-debug makefiles is newer. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * src/Makefile.am (stamp-debug): Add all Makefiles as prerequisites. * src/Makefile.in: Regenerate. Tested x86_64-linux. Committed to trunk. --BmJfInztmbVwmg6C Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit fce4e12f8efb3b3db959b807201e08786b001f39 Author: Jonathan Wakely Date: Thu Sep 16 21:21:56 2021 libstdc++: Regenerate the src/debug Makefiles as needed When the build configuration changes and Makefiles are recreated, the src/debug/Makefile and src/debug/*/Makefile files are not recreated, because they're not managed in the usual way by automake. This can lead to build failures or surprising inconsistencies between the main and debug versions of the library when doing incremental builds. This causes them to be regenerated if any of the corresponding non-debug makefiles is newer. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * src/Makefile.am (stamp-debug): Add all Makefiles as prerequisites. * src/Makefile.in: Regenerate. diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 16f4cc6eff4..f27d3f8c87e 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -369,7 +369,7 @@ endif # Build a debug variant. # Take care to fix all possibly-relative paths. debugdir = ${glibcxx_builddir}/src/debug -stamp-debug: +stamp-debug: Makefile $(foreach dir,$(SUBDIRS),$(dir)/Makefile) if test ! -d ${debugdir} || test ! -f ${debugdir}/Makefile ; then \ mkdir -p ${debugdir}; \ for d in $(SUBDIRS); do mkdir -p ${debugdir}/$$d; done; \ --BmJfInztmbVwmg6C--