Mercurial > hg > truffle

comparison make/linux/makefiles/defs.make @ 6858:b261523fe66c hs25-b05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 12 Oct 2012 13:55:52 -0700
parents fb19af007ffc
children 857f3ce858dd
comparison
equal deleted inserted replaced
6829:0cc77f9b31ad 6858:b261523fe66c
252 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo 252 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
253 endif 253 endif
254 endif 254 endif
255 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 255 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
256 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 256 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
257 EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
257 258
258 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar 259 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
259 260
260 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 261 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
261 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 262 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
279 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo 280 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
280 endif 281 endif
281 endif 282 endif
282 endif 283 endif
283 284
285 ifeq ($(JVM_VARIANT_MINIMAL1),true)
286 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt
287 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
288
289 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
290 ifeq ($(ZIP_DEBUGINFO_FILES),1)
291 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz
292 else
293 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
294 endif
295 endif
296 endif
297
284 # Serviceability Binaries 298 # Serviceability Binaries
285 # No SA Support for PPC, IA64, ARM or zero 299 # No SA Support for PPC, IA64, ARM or zero
286 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 300 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
287 $(EXPORT_LIB_DIR)/sa-jdi.jar 301 $(EXPORT_LIB_DIR)/sa-jdi.jar
288 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 302 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \