hotspot/make/HotspotCommon.gmk

*** 31,40 ****
--- 31,49 ----
  JVM_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm
  JVM_SUPPORT_DIR := $(JVM_VARIANT_OUTPUTDIR)/support
  
  DTRACE_SUPPORT_DIR := $(JVM_SUPPORT_DIR)/dtrace
  
+ LIB_OUTPUTDIR := $(call FindLibDirForModule, java.base)
+ ifneq ($(filter client minimal, $(JVM_VARIANT)), )
+   JVM_VARIANT_SUBDIR := $(JVM_VARIANT)
+ else
+   # Use 'server' as default target directory name for all other variants.
+   JVM_VARIANT_SUBDIR := server
+ endif
+ JVM_LIB_OUTPUTDIR := $(LIB_OUTPUTDIR)/$(JVM_VARIANT_SUBDIR)
+ 
  ################################################################################
  
  # Test if a feature is available in the present build of JVM_VARIANT. Will return
  # 'true' or 'false'.
  # $1 - the feature to test for