comparison make/copy/Copy-java.base.gmk @ 16338:81508186e5bc

8066474: Remove the lib/ directory from Linux and Solaris images Reviewed-by: tbell, ihse
author erikj
date Mon, 05 Dec 2016 17:56:20 +0100
parents be7aedddbb76
children f1396b432230
comparison
equal deleted inserted replaced
19:009b46d66c24 22:c70d7c3343b0
98 else 98 else
99 JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg 99 JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
100 # Allow override by ALT_JVMCFG_SRC if it exists 100 # Allow override by ALT_JVMCFG_SRC if it exists
101 JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC)) 101 JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
102 endif 102 endif
103 JVMCFG_DIR := $(LIB_DST_DIR)$(OPENJDK_TARGET_CPU_LIBDIR) 103 JVMCFG := $(LIB_DST_DIR)/jvm.cfg
104 JVMCFG := $(JVMCFG_DIR)/jvm.cfg
105 104
106 # To do: should this also support -zeroshark? 105 # To do: should this also support -zeroshark?
107 106
108 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) 107 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
109 COPY_JVM_CFG_FILE := true 108 COPY_JVM_CFG_FILE := true