Mercurial > hg > graal-compiler

comparison make/bsd/makefiles/defs.make @ 5946:3d7ea1dbe0de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built Reviewed-by: dholmes, ohair
author erikj
date Mon, 19 Mar 2012 10:09:24 +0100
parents 2d503de963b3
children fb19af007ffc
comparison
equal deleted inserted replaced
5945:77591ef8983a 5946:3d7ea1dbe0de
36 else 36 else
37 ARCH_DATA_MODEL ?= 32 37 ARCH_DATA_MODEL ?= 32
38 endif 38 endif
39 39
40 # zero 40 # zero
41 ifeq ($(ZERO_BUILD), true) 41 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
42 ifeq ($(ARCH_DATA_MODEL), 64) 42 ifeq ($(ARCH_DATA_MODEL), 64)
43 MAKE_ARGS += LP64=1 43 MAKE_ARGS += LP64=1
44 endif 44 endif
45 PLATFORM = bsd-zero 45 PLATFORM = bsd-zero
46 VM_PLATFORM = bsd_$(subst i386,i486,$(ZERO_LIBARCH)) 46 VM_PLATFORM = bsd_$(subst i386,i486,$(ZERO_LIBARCH))
122 PLATFORM = bsd-ppc 122 PLATFORM = bsd-ppc
123 VM_PLATFORM = bsd_ppc 123 VM_PLATFORM = bsd_ppc
124 HS_ARCH = ppc 124 HS_ARCH = ppc
125 endif 125 endif
126 126
127 # On 32 bit bsd we build server and client, on 64 bit just server.
128 ifeq ($(JVM_VARIANTS),)
129 ifeq ($(ARCH_DATA_MODEL), 32)
130 JVM_VARIANTS:=client,server
131 JVM_VARIANT_CLIENT:=true
132 JVM_VARIANT_SERVER:=true
133 else
134 JVM_VARIANTS:=server
135 JVM_VARIANT_SERVER:=true
136 endif
137 endif
138
127 JDK_INCLUDE_SUBDIR=bsd 139 JDK_INCLUDE_SUBDIR=bsd
128 140
129 # Library suffix 141 # Library suffix
130 OS_VENDOR:=$(shell uname -s) 142 OS_VENDOR:=$(shell uname -s)
131 ifeq ($(OS_VENDOR),Darwin) 143 ifeq ($(OS_VENDOR),Darwin)
144 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 156 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
145 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 157 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
146 158
147 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar 159 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
148 160
149 ifndef BUILD_CLIENT_ONLY 161 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
150 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 162 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
151 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 163 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
152 endif 164 endif
153 165
154 ifneq ($(ZERO_BUILD), true) 166 ifeq ($(JVM_VARIANT_CLIENT),true)
155 ifeq ($(ARCH_DATA_MODEL), 32) 167 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
156 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 168 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
157 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
158 endif
159 endif 169 endif
160 170
161 # Serviceability Binaries 171 # Serviceability Binaries
162 # No SA Support for PPC, IA64, ARM or zero 172 # No SA Support for PPC, IA64, ARM or zero
163 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 173 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \