make/copy/Copy-java.base.gmk

*** 84,98 ****
  ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86)
    DEFAULT_CFG_VARIANT ?= client
  endif
  DEFAULT_CFG_VARIANT ?= server
  
! # Any variant other than server, client or minimal is represented as server in
! # the cfg file.
! VALID_CFG_VARIANTS := server client minimal
! CFG_VARIANTS := $(filter $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)) \
!     $(if $(filter-out $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)), server)
  
  # Change the order to put the default variant first if present.
  ORDERED_CFG_VARIANTS := \
      $(if $(filter $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS)), $(DEFAULT_CFG_VARIANT)) \
      $(filter-out $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS))
--- 84,97 ----
  ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86)
    DEFAULT_CFG_VARIANT ?= client
  endif
  DEFAULT_CFG_VARIANT ?= server
  
! # Any variant other than the valid multiple jvm variants is represented as
! # server in the cfg file.
! CFG_VARIANTS := $(filter $(VALID_MULTIPLE_JVM_VARIANTS), $(JVM_VARIANTS)) \
!     $(if $(filter-out $(VALID_MULTIPLE_JVM_VARIANTS), $(JVM_VARIANTS)), server)
  
  # Change the order to put the default variant first if present.
  ORDERED_CFG_VARIANTS := \
      $(if $(filter $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS)), $(DEFAULT_CFG_VARIANT)) \
      $(filter-out $(DEFAULT_CFG_VARIANT), $(CFG_VARIANTS))