Mercurial > hg > graal-jvmci-8

comparison make/windows/makefiles/defs.make @ 6022:74c359c4a9e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dcubed
date Tue, 24 Apr 2012 15:20:40 -0700
parents 3d7ea1dbe0de 744728c16316
children d6c393b0164b
comparison
equal deleted inserted replaced
6019:f33c4d0f4c9e 6022:74c359c4a9e5
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 107 endif
108 endif 108 endif
109
110 # Full Debug Symbols has been enabled on Windows since JDK1.4.1 so
111 # there is no need for an "earlier than JDK7 check".
112 # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product
113 # builds is enabled with debug info files ZIP'ed to save space. For
114 # BUILD_FLAVOR != product builds, FDS is always enabled, after all a
115 # debug build without debug info isn't very useful.
116 # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
117 #
118 # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
119 # disabled for a BUILD_FLAVOR == product build.
120 #
121 # Note: Use of a different variable name for the FDS override option
122 # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
123 # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
124 # in options via environment variables, use of distinct variables
125 # prevents strange behaviours. For example, in a BUILD_FLAVOR !=
126 # product build, the FULL_DEBUG_SYMBOLS environment variable will be
127 # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If
128 # the same variable name is used, then different values can be picked
129 # up by different parts of the build. Just to be clear, we only need
130 # two variable names because the incoming option value can be
131 # overridden in some situations, e.g., a BUILD_FLAVOR != product
132 # build.
133
134 ifeq ($(BUILD_FLAVOR), product)
135 FULL_DEBUG_SYMBOLS ?= 1
136 ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
137 else
138 # debug variants always get Full Debug Symbols (if available)
139 ENABLE_FULL_DEBUG_SYMBOLS = 1
140 endif
141 _JUNK_ := $(shell \
142 echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
143 MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)
144
145 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
146 ZIP_DEBUGINFO_FILES ?= 1
147 else
148 ZIP_DEBUGINFO_FILES=0
149 endif
150 MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)
151 MAKE_ARGS += RM="$(RM)"
152 MAKE_ARGS += ZIPEXE=$(ZIPEXE)
109 153
110 # On 32 bit windows we build server, client and kernel, on 64 bit just server. 154 # On 32 bit windows we build server, client and kernel, on 64 bit just server.
111 ifeq ($(JVM_VARIANTS),) 155 ifeq ($(JVM_VARIANTS),)
112 ifeq ($(ARCH_DATA_MODEL), 32) 156 ifeq ($(ARCH_DATA_MODEL), 32)
113 JVM_VARIANTS:=client,server,kernel 157 JVM_VARIANTS:=client,server,kernel
191 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel 235 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
192 236
193 ifeq ($(JVM_VARIANT_SERVER),true) 237 ifeq ($(JVM_VARIANT_SERVER),true)
194 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 238 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
195 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) 239 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
196 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb 240 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
197 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map 241 ifeq ($(ZIP_DEBUGINFO_FILES),1)
242 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.diz
243 else
244 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
245 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
246 endif
247 endif
198 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib 248 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
199 endif 249 endif
200 ifeq ($(JVM_VARIANT_CLIENT),true) 250 ifeq ($(JVM_VARIANT_CLIENT),true)
201 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 251 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
202 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX) 252 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
203 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb 253 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
204 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map 254 ifeq ($(ZIP_DEBUGINFO_FILES),1)
255 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.diz
256 else
257 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
258 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
259 endif
260 endif
205 endif 261 endif
206 ifeq ($(JVM_VARIANT_KERNEL),true) 262 ifeq ($(JVM_VARIANT_KERNEL),true)
207 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt 263 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
208 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX) 264 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
209 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb 265 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
210 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map 266 ifeq ($(ZIP_DEBUGINFO_FILES),1)
267 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.diz
268 else
269 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
270 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
271 endif
272 endif
211 endif 273 endif
212 274
213 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar 275 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
214 276
215 ifeq ($(BUILD_WIN_SA), 1) 277 ifeq ($(BUILD_WIN_SA), 1)
216 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX) 278 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX)
217 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb 279 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
218 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map 280 ifeq ($(ZIP_DEBUGINFO_FILES),1)
281 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.diz
282 else
283 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
284 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
285 endif
286 endif
219 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 287 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
220 # Must pass this down to nmake. 288 # Must pass this down to nmake.
221 MAKE_ARGS += BUILD_WIN_SA=1 289 MAKE_ARGS += BUILD_WIN_SA=1
222 endif 290 endif
223 291