Mercurial > hg > truffle

comparison make/windows/makefiles/defs.make @ 17828:8a84bedf7173

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8016039: jvm.lib is missing from export list unless building server Summary: make the export declaration unconditional Reviewed-by: sla, sspitsyn
author dholmes
date Mon, 31 Mar 2014 23:49:00 -0400
parents 0380df7c3cd0
children
comparison
equal deleted inserted replaced
17827:f42c10a3d4b1 17828:8a84bedf7173
258 else 258 else
259 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb 259 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
260 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map 260 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
261 endif 261 endif
262 endif 262 endif
263 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
264 endif 263 endif
265 ifeq ($(JVM_VARIANT_CLIENT),true) 264 ifeq ($(JVM_VARIANT_CLIENT),true)
266 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 265 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
267 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX) 266 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
268 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 267 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
273 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map 272 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
274 endif 273 endif
275 endif 274 endif
276 endif 275 endif
277 276
277 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
278
278 ifeq ($(BUILD_WIN_SA), 1) 279 ifeq ($(BUILD_WIN_SA), 1)
279 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX) 280 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX)
280 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 281 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
281 ifeq ($(ZIP_DEBUGINFO_FILES),1) 282 ifeq ($(ZIP_DEBUGINFO_FILES),1)
282 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.diz 283 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.diz