--- old/make/CreateJmods.gmk	2019-02-05 15:44:51.238734014 +0100
+++ new/make/CreateJmods.gmk	2019-02-05 15:44:51.058734013 +0100
@@ -118,7 +118,7 @@
     endif
   endif
 else # not java.base
-  ifeq ($(OPENJDK_TARGET_OS), windows)
+  ifeq ($(call isTargetOs, windows), true)
     # Only java.base needs to include the MSVC*_DLLs. Make sure no other module
     # tries to include them (typically imported ones).
     ifneq ($(MSVCR_DLL), )