Mercurial > hg > truffle

comparison make/solaris/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 74c359c4a9e5
comparison
equal deleted inserted replaced
5945:77591ef8983a 5946:3d7ea1dbe0de
54 HS_ARCH=x86 54 HS_ARCH=x86
55 else 55 else
56 PLATFORM=solaris-i586 56 PLATFORM=solaris-i586
57 VM_PLATFORM=solaris_i486 57 VM_PLATFORM=solaris_i486
58 HS_ARCH=x86 58 HS_ARCH=x86
59 endif
60 endif
61
62 # On 32 bit solaris we build server and client, on 64 bit just server.
63 ifeq ($(JVM_VARIANTS),)
64 ifeq ($(ARCH_DATA_MODEL), 32)
65 JVM_VARIANTS:=client,server
66 JVM_VARIANT_CLIENT:=true
67 JVM_VARIANT_SERVER:=true
68 else
69 JVM_VARIANTS:=server
70 JVM_VARIANT_SERVER:=true
59 endif 71 endif
60 endif 72 endif
61 73
62 # determine if HotSpot is being built in JDK6 or earlier version 74 # determine if HotSpot is being built in JDK6 or earlier version
63 JDK6_OR_EARLIER=0 75 JDK6_OR_EARLIER=0
151 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar 163 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
152 164
153 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 165 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
154 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 166 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
155 167
156 ifneq ($(BUILD_CLIENT_ONLY),true) 168 ifeq ($(JVM_VARIANT_SERVER),true)
157 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 169 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
158 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 170 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
159 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 171 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
160 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) 172 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
173 ifeq ($(ARCH_DATA_MODEL),32)
174 EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
175 EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
176 endif
161 ifneq ($(OBJCOPY),) 177 ifneq ($(OBJCOPY),)
162 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo 178 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
163 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo 179 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo
164 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo 180 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo
165 endif 181 endif
166 endif 182 endif
167 ifeq ($(ARCH_DATA_MODEL), 32) 183 ifeq ($(JVM_VARIANT_CLIENT),true)
168 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 184 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
169 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 185 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
170 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 186 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
171 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) 187 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
172 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) 188 ifeq ($(ARCH_DATA_MODEL),32)
173 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) 189 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
190 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
191 endif
174 ifneq ($(OBJCOPY),) 192 ifneq ($(OBJCOPY),)
175 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo 193 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
176 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo 194 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo
177 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo 195 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo
178 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo 196 ifeq ($(ARCH_DATA_MODEL),32)
179 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo 197 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo
180 endif 198 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo
181 ifneq ($(BUILD_CLIENT_ONLY), true)
182 EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
183 EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
184 ifneq ($(OBJCOPY),)
185 EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo
186 EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo
187 endif 199 endif
188 endif 200 endif
189 endif 201 endif
190 202
191 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) 203 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)