diff -rauN jdk10u-jdk-10.0.2+13/make/common/MakeBase.gmk jdk10u-jdk-10.0.2+13-make43-patch/make/common/MakeBase.gmk --- jdk10u-jdk-10.0.2+13/make/common/MakeBase.gmk 2018-06-24 16:07:06.000000000 +0200 +++ jdk10u-jdk-10.0.2+13-make43-patch/make/common/MakeBase.gmk 2021-05-16 20:53:00.001488298 +0200 @@ -960,15 +960,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