make/hotspot/lib/JvmFlags.gmk

@@ -72,11 +72,11 @@
   ifneq ($(HOTSPOT_DEBUG_LEVEL), optimized)
     JVM_CFLAGS_DEBUGLEVEL := -DPRODUCT
   endif
 else ifeq ($(DEBUG_LEVEL), fastdebug)
   JVM_CFLAGS_DEBUGLEVEL := -DASSERT
-  ifeq ($(filter $(OPENJDK_TARGET_OS), windows aix), )
+  ifneq ($call isTargetOs, windows aix), true)
     # NOTE: Old build did not define CHECK_UNHANDLED_OOPS on Windows and AIX.
     JVM_CFLAGS_DEBUGLEVEL += -DCHECK_UNHANDLED_OOPS
   endif
 else ifeq ($(DEBUG_LEVEL), slowdebug)
   # _NMT_NOINLINE_ informs NMT that no inlining is done by the compiler