Mercurial > hg > graal-compiler

comparison make/windows/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 22d276ade3e1
children 74c359c4a9e5
comparison
equal deleted inserted replaced
5945:77591ef8983a 5946:3d7ea1dbe0de
102 MAKE_ARGS += LP64=1 102 MAKE_ARGS += LP64=1
103 MAKE_ARGS += ARCH=x86 103 MAKE_ARGS += ARCH=x86
104 MAKE_ARGS += BUILDARCH=amd64 104 MAKE_ARGS += BUILDARCH=amd64
105 MAKE_ARGS += Platform_arch=x86 105 MAKE_ARGS += Platform_arch=x86
106 MAKE_ARGS += Platform_arch_model=x86_64 106 MAKE_ARGS += Platform_arch_model=x86_64
107 endif
108 endif
109
110 # On 32 bit windows we build server, client and kernel, on 64 bit just server.
111 ifeq ($(JVM_VARIANTS),)
112 ifeq ($(ARCH_DATA_MODEL), 32)
113 JVM_VARIANTS:=client,server,kernel
114 JVM_VARIANT_CLIENT:=true
115 JVM_VARIANT_SERVER:=true
116 JVM_VARIANT_KERNEL:=true
117 else
118 JVM_VARIANTS:=server
119 JVM_VARIANT_SERVER:=true
107 endif 120 endif
108 endif 121 endif
109 122
110 JDK_INCLUDE_SUBDIR=win32 123 JDK_INCLUDE_SUBDIR=win32
111 124
175 188
176 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server 189 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
177 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client 190 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
178 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel 191 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
179 192
180 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 193 ifeq ($(JVM_VARIANT_SERVER),true)
181 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) 194 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
182 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb 195 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
183 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map 196 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
184 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib 197 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
185 ifeq ($(ARCH_DATA_MODEL), 32) 198 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
199 endif
200 ifeq ($(JVM_VARIANT_CLIENT),true)
186 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 201 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
187 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX) 202 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
188 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb 203 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
189 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map 204 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
190 # kernel vm 205 endif
206 ifeq ($(JVM_VARIANT_KERNEL),true)
191 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt 207 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
192 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX) 208 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
193 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb 209 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
194 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map 210 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
195 endif 211 endif