make/copy/Copy-java.base.gmk

*** 74,84 ****
  
  ################################################################################
  #
  # How to install jvm.cfg.
  #
! ifeq ($(JVM_VARIANT_ZERO), true)
    JVMCFG_ARCH := zero
  else
    JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
  endif
  
--- 74,84 ----
  
  ################################################################################
  #
  # How to install jvm.cfg.
  #
! ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    JVMCFG_ARCH := zero
  else
    JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
  endif
  
*** 106,116 ****
    CLIENT_AND_SERVER := $(and $(findstring true, $(JVM_VARIANT_SERVER)), $(findstring true, $(JVM_VARIANT_CLIENT)))
    ifeq ($(CLIENT_AND_SERVER), true)
      COPY_JVM_CFG_FILE := true
    else
      # For zero, the default jvm.cfg file is sufficient
!     ifeq ($(JVM_VARIANT_ZERO), true)
        COPY_JVM_CFG_FILE := true
      endif
    endif
  endif
  
--- 106,116 ----
    CLIENT_AND_SERVER := $(and $(findstring true, $(JVM_VARIANT_SERVER)), $(findstring true, $(JVM_VARIANT_CLIENT)))
    ifeq ($(CLIENT_AND_SERVER), true)
      COPY_JVM_CFG_FILE := true
    else
      # For zero, the default jvm.cfg file is sufficient
!     ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
        COPY_JVM_CFG_FILE := true
      endif
    endif
  endif