summarylogtreecommitdiffstats
path: root/make_4.3.patch
blob: 6c65928dc17d54153570613b653d5ade50d814f0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
diff -Naur jdk12u-jdk-12.0.2+10.orig/make/common/MakeBase.gmk jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk
--- jdk12u-jdk-12.0.2+10.orig/make/common/MakeBase.gmk	2019-07-16 18:38:28.000000000 +0200
+++ jdk12u-jdk-12.0.2+10/make/common/MakeBase.gmk	2021-11-28 16:36:13.183030878 +0100
@@ -977,15 +977,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