--- old/make/hotspot/HotspotCommon.gmk	2018-06-08 14:40:39.527835653 -0700
+++ new/make/hotspot/HotspotCommon.gmk	2018-06-08 14:40:39.307835660 -0700
@@ -34,7 +34,7 @@
 DTRACE_SUPPORT_DIR := $(JVM_SUPPORT_DIR)/dtrace
 
 LIB_OUTPUTDIR := $(call FindLibDirForModule, java.base)
-ifneq ($(filter client minimal, $(JVM_VARIANT)), )
+ifneq ($(filter $(VALID_MULTIPLE_JVM_VARIANTS), $(JVM_VARIANT)), )
   JVM_VARIANT_SUBDIR := $(JVM_VARIANT)
 else
   # Use 'server' as default target directory name for all other variants.