comparison make/bsd/makefiles/defs.make @ 4006:436b4a3231bf

7098194: integrate macosx-port changes Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29. Reviewed-by: kvn, dholmes, never, phh Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author dcubed
date Thu, 13 Oct 2011 09:35:42 -0700
parents f08d439fab8c
children e8a4934564b2
comparison
equal deleted inserted replaced
4005:2ef3386478e6 4006:436b4a3231bf
160 # No SA Support for PPC, IA64, ARM or zero 160 # No SA Support for PPC, IA64, ARM or zero
161 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 161 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
162 $(EXPORT_LIB_DIR)/sa-jdi.jar 162 $(EXPORT_LIB_DIR)/sa-jdi.jar
163 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 163 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
164 $(EXPORT_LIB_DIR)/sa-jdi.jar 164 $(EXPORT_LIB_DIR)/sa-jdi.jar
165 ADD_SA_BINARIES/universal = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
166 $(EXPORT_LIB_DIR)/sa-jdi.jar
165 ADD_SA_BINARIES/ppc = 167 ADD_SA_BINARIES/ppc =
166 ADD_SA_BINARIES/ia64 = 168 ADD_SA_BINARIES/ia64 =
167 ADD_SA_BINARIES/arm = 169 ADD_SA_BINARIES/arm =
168 ADD_SA_BINARIES/zero = 170 ADD_SA_BINARIES/zero =
169 171
170 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) 172 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
173
174 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
175 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
176 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
177
178 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
179 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
180 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)