From 2b7eee4a4c1e8b9421c5db601da83000c344b78e Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Fri, 19 Sep 2025 13:04:18 +0000
Subject: [PATCH] 8366899: SetupExecute should add the command line to vardeps

Reviewed-by: erikj
---
 make/common/Execute.gmk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/make/common/Execute.gmk b/make/common/Execute.gmk
index 4199e8f13b7..0311c4ecba1 100644
--- a/make/common/Execute.gmk
+++ b/make/common/Execute.gmk
@@ -148,9 +148,12 @@ define SetupExecuteBody
     $1_INFO := Running commands for $1
   endif
 
+  $1_VARDEPS := $$($1_COMMAND) $$($1_PRE_COMMAND) $$($1_POST_COMMAND)
+  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS)
+
   ifneq ($$($1_PRE_COMMAND), )
 
-    $$($1_PRE_MARKER): $$($1_DEPS)
+    $$($1_PRE_MARKER): $$($1_DEPS) $$($1_VARDEPS_FILE)
         ifneq ($$($1_WARN), )
 	  $$(call LogWarn, $$($1_WARN))
         endif
@@ -176,7 +179,7 @@ define SetupExecuteBody
 
     $1 := $$($1_PRE_MARKER) $$($1_EXEC_RESULT)
   else
-    $$($1_EXEC_RESULT): $$($1_DEPS)
+    $$($1_EXEC_RESULT): $$($1_DEPS) $$($1_VARDEPS_FILE)
         ifneq ($$($1_WARN), )
 	  $$(call LogWarn, $$($1_WARN))
         endif