69   ifneq ($(UCRT_DLL_DIR), )
  70     $(eval $(call SetupCopyFiles, COPY_UCRT_DLLS, \
  71         DEST := $(LIB_DST_DIR), \
  72         SRC := $(UCRT_DLL_DIR), \
  73         FILES := $(wildcard $(UCRT_DLL_DIR)/*.dll), \
  74         MACRO := copy-and-chmod, \
  75     ))
  76 
  77     TARGETS += $(COPY_UCRT_DLLS)
  78   endif
  79 endif
  80 
  81 ################################################################################
  82 # In jvm.cfg, the first listed KNOWN variant is the default. On most build
  83 # configurations, that is the server variant.
  84 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86)
  85   DEFAULT_CFG_VARIANT ?= client
  86 endif
  87 DEFAULT_CFG_VARIANT ?= server
  88 
  89 # Any variant other than server, client or minimal is represented as server in
  90 # the cfg file.
  91 VALID_CFG_VARIANTS := server client minimal
  92 CFG_VARIANTS := $(filter $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)) \
  93     $(if $(filter-out $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)), server)
  94 
  95 # Change the order to put the default variant first if present.
  96 ORDERED_CFG_VARIANTS := \
  97     $(if $(filter $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS)), $(DEFAULT_CFG_VARIANT)) \
  98     $(filter-out $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS))
  99 
 100 JVMCFG := $(LIB_DST_DIR)/jvm.cfg
 101 
 102 define print-cfg-line
 103         $(call LogInfo, Adding -$1 $2 to jvm.cfg)
 104         $(PRINTF) -- "-$1 $2\n" >> $@ $(NEWLINE)
 105 endef
 106 
 107 $(JVMCFG): $(call DependOnVariable, ORDERED_CFG_VARIANTS)
 108         $(call MakeTargetDir)
 109         $(RM) $@
 110         $(foreach v, $(ORDERED_CFG_VARIANTS), \
 111           $(call print-cfg-line,$v,KNOWN) \
 112         )
 113         # If either of server or client aren't present, add IGNORE lines for

  69   ifneq ($(UCRT_DLL_DIR), )
  70     $(eval $(call SetupCopyFiles, COPY_UCRT_DLLS, \
  71         DEST := $(LIB_DST_DIR), \
  72         SRC := $(UCRT_DLL_DIR), \
  73         FILES := $(wildcard $(UCRT_DLL_DIR)/*.dll), \
  74         MACRO := copy-and-chmod, \
  75     ))
  76 
  77     TARGETS += $(COPY_UCRT_DLLS)
  78   endif
  79 endif
  80 
  81 ################################################################################
  82 # In jvm.cfg, the first listed KNOWN variant is the default. On most build
  83 # configurations, that is the server variant.
  84 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86)
  85   DEFAULT_CFG_VARIANT ?= client
  86 endif
  87 DEFAULT_CFG_VARIANT ?= server
  88 
  89 # Any variant other than the valid multiple jvm variants is represented as
  90 # server in the cfg file.
  91 CFG_VARIANTS := $(filter $(VALID_MULTIPLE_JVM_VARIANTS), $(JVM_VARIANTS)) \
  92     $(if $(filter-out $(VALID_MULTIPLE_JVM_VARIANTS), $(JVM_VARIANTS)), server)

  93 
  94 # Change the order to put the default variant first if present.
  95 ORDERED_CFG_VARIANTS := \
  96     $(if $(filter $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS)), $(DEFAULT_CFG_VARIANT)) \
  97     $(filter-out $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS))
  98 
  99 JVMCFG := $(LIB_DST_DIR)/jvm.cfg
 100 
 101 define print-cfg-line
 102         $(call LogInfo, Adding -$1 $2 to jvm.cfg)
 103         $(PRINTF) -- "-$1 $2\n" >> $@ $(NEWLINE)
 104 endef
 105 
 106 $(JVMCFG): $(call DependOnVariable, ORDERED_CFG_VARIANTS)
 107         $(call MakeTargetDir)
 108         $(RM) $@
 109         $(foreach v, $(ORDERED_CFG_VARIANTS), \
 110           $(call print-cfg-line,$v,KNOWN) \
 111         )
 112         # If either of server or client aren't present, add IGNORE lines for