-
Enhancement
-
Resolution: Won't Fix
-
P4
-
hs25
-
generic
-
generic
The default target setup in make/Makefile looks like this:
# Typical C1/C2 targets made available with this Makefile
C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
C2_VM_TARGETS=product fastdebug optimized jvmg
KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
COMMON_VM_PRODUCT_TARGETS=product product1 productkernel docs export_product
COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 jvmgkernel docs export_debug
# JDK directory list
JDK_DIRS=bin include jre lib demo
all: all_product all_fastdebug
ifdef BUILD_CLIENT_ONLY
all_product: product1 docs export_product
all_fastdebug: fastdebug1 docs export_fastdebug
all_debug: jvmg1 docs export_debug
else
ifeq ($(MACOSX_UNIVERSAL),true)
all_product: universal_product
all_fastdebug: universal_fastdebug
all_debug: universal_debug
else
all_product: $(COMMON_VM_PRODUCT_TARGETS)
all_fastdebug: $(COMMON_VM_FASTDEBUG_TARGETS)
all_debug: $(COMMON_VM_DEBUG_TARGETS)
endif
endif
But now that we have the JVM_VARIANT variables (added by the new build system) it should look something like this:
ifeq ($(JVM_VARIANT_SERVER),true)
COMMON_VM_PRODUCT_TARGETS=product
COMMON_VM_FASTDEBUG_TARGETS=fastdebug
COMMON_VM_DEBUG_TARGETS=jvmg
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
COMMON_VM_PRODUCT_TARGETS += product1
COMMON_VM_FASTDEBUG_TARGETS += fastdebug1
COMMON_VM_DEBUG_TARGETS += jvmg1
endif
COMMON_VM_PRODUCT_TARGETS += docs export_product
COMMON_VM_FASTDEBUG_TARGETS += docs export_fastdebug
COMMON_VM_DEBUG_TARGETS += docs export_debug
# Typical C1/C2 targets made available with this Makefile
C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
C2_VM_TARGETS=product fastdebug optimized jvmg
KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
COMMON_VM_PRODUCT_TARGETS=product product1 productkernel docs export_product
COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 jvmgkernel docs export_debug
# JDK directory list
JDK_DIRS=bin include jre lib demo
all: all_product all_fastdebug
ifdef BUILD_CLIENT_ONLY
all_product: product1 docs export_product
all_fastdebug: fastdebug1 docs export_fastdebug
all_debug: jvmg1 docs export_debug
else
ifeq ($(MACOSX_UNIVERSAL),true)
all_product: universal_product
all_fastdebug: universal_fastdebug
all_debug: universal_debug
else
all_product: $(COMMON_VM_PRODUCT_TARGETS)
all_fastdebug: $(COMMON_VM_FASTDEBUG_TARGETS)
all_debug: $(COMMON_VM_DEBUG_TARGETS)
endif
endif
But now that we have the JVM_VARIANT variables (added by the new build system) it should look something like this:
ifeq ($(JVM_VARIANT_SERVER),true)
COMMON_VM_PRODUCT_TARGETS=product
COMMON_VM_FASTDEBUG_TARGETS=fastdebug
COMMON_VM_DEBUG_TARGETS=jvmg
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
COMMON_VM_PRODUCT_TARGETS += product1
COMMON_VM_FASTDEBUG_TARGETS += fastdebug1
COMMON_VM_DEBUG_TARGETS += jvmg1
endif
COMMON_VM_PRODUCT_TARGETS += docs export_product
COMMON_VM_FASTDEBUG_TARGETS += docs export_fastdebug
COMMON_VM_DEBUG_TARGETS += docs export_debug
- relates to
-
JDK-7190137 Add support for JVM_VARIANT minimal1
- Resolved