upstream report: https://bugs.openjdk.java.net/browse/JDK-8237879.

diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 170c3ed..697f9d2 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -984,7 +984,9 @@ DependOnVariableHelper = \
               $(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)) \
+              $(eval $(call DependOnVariableFileName, $1, $2): ) \
+        ) \
         $(call DependOnVariableFileName, $1, $2) \
     )