Mercurial > hg > graal-jvmci-8

comparison make/bsd/makefiles/defs.make @ 6856:9855b7e559ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author collins
date Fri, 12 Oct 2012 10:49:39 -0700
parents fb19af007ffc
children 1b0dc9f87e75
comparison
equal deleted inserted replaced
6842:b9a9ed0f8eeb 6856:9855b7e559ae
153 153
154 # client and server subdirectories have symbolic links to ../libjsig.so 154 # client and server subdirectories have symbolic links to ../libjsig.so
155 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) 155 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
156 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 156 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
157 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 157 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
158 EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
158 159
159 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar 160 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
160 161
161 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 162 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
162 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 163 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
164 endif 165 endif
165 166
166 ifeq ($(JVM_VARIANT_CLIENT),true) 167 ifeq ($(JVM_VARIANT_CLIENT),true)
167 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 168 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
168 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 169 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
170 endif
171
172 ifeq ($(JVM_VARIANT_MINIMAL1),true)
173 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt
174 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
175
176 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
177 ifeq ($(ZIP_DEBUGINFO_FILES),1)
178 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz
179 else
180 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
181 endif
182 endif
169 endif 183 endif
170 184
171 # Serviceability Binaries 185 # Serviceability Binaries
172 # No SA Support for PPC, IA64, ARM or zero 186 # No SA Support for PPC, IA64, ARM or zero
173 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 187 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \