commit f5b96177df89e36a6c281dffebd08688cfeea02b
author Magnus Ihse Bursie <ihse@openjdk.org> Thu Jan 30 11:08:30 2020 +0100
committer Magnus Ihse Bursie <ihse@openjdk.org> Thu Jan 30 11:08:30 2020 +0100
tree f676a9c99b17cf32be95a7d4f81800f53dba8110
parent 3e9a9c9c4955185ae2be6dd97ddf1c03a4588395

8237879: make 4.3 breaks build

Reviewed-by: erikj, tbell

make/common/MakeBase.gmk

diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 51aaa28..a040eff 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -1036,15 +1036,16 @@
 # Param 2 - (optional) name of file to store value in
 DependOnVariableHelper = \
     $(strip \
-        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
+        $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
+        $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
-          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
+          $(call MakeDir, $(dir $($1_filename))) \
           $(if $(findstring $(LOG_LEVEL), trace), \
               $(info NewVariable $1: >$(strip $($1))<) \
               $(info OldVariable $1: >$(strip $($1_old))<)) \
           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
-              $(call DependOnVariableFileName, $1, $2))) \
-        $(call DependOnVariableFileName, $1, $2) \
+              $($1_filename))) \
+        $($1_filename) \
     )
 
 # Main macro