make/copy/Copy-java.base.gmk

rev 47445 : 8171853: Remove Shark compiler

*** 85,95 ****
  
  ################################################################################
  #
  # How to install jvm.cfg.
  #
! ifeq ($(call check-jvm-variant, zero zeroshark), true)
    JVMCFG_ARCH := zero
  else
    JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
  endif
  
--- 85,95 ----
  
  ################################################################################
  #
  # How to install jvm.cfg.
  #
! ifeq ($(call check-jvm-variant, zero), true)
    JVMCFG_ARCH := zero
  else
    JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
  endif
  
*** 100,111 ****
    # Allow override by ALT_JVMCFG_SRC if it exists
    JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
  endif
  JVMCFG := $(LIB_DST_DIR)/jvm.cfg
  
- # To do: should this also support -zeroshark?
- 
  ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
    COPY_JVM_CFG_FILE := true
  else
    # On 32-bit machines we have three potential VMs: client, server and minimal.
    # Historically we usually have both client and server and so that is what the
--- 100,109 ----
*** 118,128 ****
    CLIENT_AND_SERVER := $(call check-jvm-variant, client)+$(call check-jvm-variant, server)
    ifeq ($(CLIENT_AND_SERVER), true+true)
      COPY_JVM_CFG_FILE := true
    else
      # For zero, the default jvm.cfg file is sufficient
!     ifeq ($(call check-jvm-variant, zero zeroshark), true)
        COPY_JVM_CFG_FILE := true
      endif
    endif
  endif
  
--- 116,126 ----
    CLIENT_AND_SERVER := $(call check-jvm-variant, client)+$(call check-jvm-variant, server)
    ifeq ($(CLIENT_AND_SERVER), true+true)
      COPY_JVM_CFG_FILE := true
    else
      # For zero, the default jvm.cfg file is sufficient
!     ifeq ($(call check-jvm-variant, zero), true)
        COPY_JVM_CFG_FILE := true
      endif
    endif
  endif