From f25f4a3eb2f3ebba4af30471de9d35778c120d50 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 27 May 2025 22:41:39 +0000
Subject: [PATCH] 8349665: Make clean removes module-deps.gmk

Reviewed-by: erikj
---
 make/Init.gmk           | 12 ++++++++----
 make/Main.gmk           |  6 ++++++
 make/PreInitSupport.gmk |  7 ++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/make/Init.gmk b/make/Init.gmk
index 5dd1a71dd9a..32624d7dee6 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -37,10 +37,6 @@ include MakeFileStart.gmk
 include $(TOPDIR)/make/InitSupport.gmk
 include LogUtils.gmk
 
-# Force early generation of module-deps.gmk
-GENERATE_MODULE_DEPS_FILE := true
-include Modules.gmk
-
 # Inclusion of this pseudo-target will cause make to execute this file
 # serially, regardless of -j.
 .NOTPARALLEL:
@@ -144,6 +140,14 @@ main: $(INIT_TARGETS)
 	    ( cd $(TOPDIR) && \
 	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
 	        $(SEQUENTIAL_TARGETS) )
+            # We might have cleaned away essential files, recreate them.
+	    ( cd $(TOPDIR) && \
+	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/GenerateFindTests.gmk \
+	        $(USER_MAKE_VARS) )
+	    ( cd $(TOPDIR) && \
+	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
+	        UPDATE_MODULE_DEPS=true NO_RECIPES=true \
+	        create-main-targets-include )
           endif
           ifneq ($(PARALLEL_TARGETS), )
 	    $(call PrepareFailureLogs)
diff --git a/make/Main.gmk b/make/Main.gmk
index 3535ad16aae..6a800a2edd5 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -42,6 +42,12 @@ include MakeFileStart.gmk
 include $(TOPDIR)/make/MainSupport.gmk
 
 include FindTests.gmk
+
+ifeq ($(UPDATE_MODULE_DEPS), true)
+  # Update module-deps.gmk if requested. This is read in Modules.gmk.
+  GENERATE_MODULE_DEPS_FILE := true
+endif
+
 include Modules.gmk
 
 # Are we requested to ignore dependencies?
diff --git a/make/PreInitSupport.gmk b/make/PreInitSupport.gmk
index 1d3c3ce9135..660e1214b5b 100644
--- a/make/PreInitSupport.gmk
+++ b/make/PreInitSupport.gmk
@@ -268,11 +268,12 @@ define DefineMainTargets
 
   $$(main_targets_file):
 	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
 	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR))
 	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/Main.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR) NO_RECIPES=true \
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/Main.gmk \
+	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR) \
+	    UPDATE_MODULE_DEPS=true NO_RECIPES=true \
 	    $$(MAKE_LOG_VARS) \
 	    create-main-targets-include )