From 68d1a8a974a8794280db1abfaa17b72d50f2e8ba Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Wed, 19 Feb 2025 07:40:50 +0000 Subject: [PATCH] Bug 1947164 - Fix pruning of build-id rebuild r=glandium Adjust to internal changes so that buildid.h and source-repo.h are generated only once (and not twice - or never) upon nop build. Differential Revision: https://phabricator.services.mozilla.com/D237591 --- Makefile.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2658629f9183dd..9f6b6d1162dfaa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,12 +24,10 @@ endif include $(topsrcdir)/config/config.mk ifneq (mobile/android,$(MOZ_BUILD_APP)) -# We only want to generate buildid.h once, during the export phase. -ifeq ($(MAKECMDGOALS),buildid.h) -$(MDDEPDIR)/buildid.h.stub: FORCE -endif -ifeq ($(MAKECMDGOALS),source-repo.h) -$(MDDEPDIR)/source-repo.h.stub: FORCE +# We only want to generate buildid.h once, during the (recurse) export phase. +# faster make build the files explicitly so also match thoses +ifneq ($(filter $(MAKECMDGOALS),recurse_export buildid.h source-repo.h),) +$(MDDEPDIR)/buildid.h.stub $(MDDEPDIR)/source-repo.h.stub: FORCE endif endif source-repo.h: $(MDDEPDIR)/source-repo.h.stub