comparison make/bsd/makefiles/defs.make @ 4846:e8a4934564b2

7125793: MAC: test_gamma should always work Summary: Fix gamma launcher on Mac OS X and reconcile test_gamma script on Unix platforms Reviewed-by: dcubed, ohair, jcoomes, dholmes, ksrini Contributed-by: james.melvin@oracle.com
author phh
date Tue, 24 Jan 2012 19:33:14 -0500
parents 436b4a3231bf
children 481a9443f721
comparison
equal deleted inserted replaced
4843:d6660fedbab5 4846:e8a4934564b2
140 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 140 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
141 141
142 # client and server subdirectories have symbolic links to ../libjsig.so 142 # client and server subdirectories have symbolic links to ../libjsig.so
143 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) 143 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
144 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 144 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
145 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
145 146
146 ifndef BUILD_CLIENT_ONLY 147 ifndef BUILD_CLIENT_ONLY
147 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 148 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
148 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 149 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
149 endif 150 endif
150 151
151 ifneq ($(ZERO_BUILD), true) 152 ifneq ($(ZERO_BUILD), true)
152 ifeq ($(ARCH_DATA_MODEL), 32) 153 ifeq ($(ARCH_DATA_MODEL), 32)
153 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
154 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 154 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
155 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 155 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
156 endif 156 endif
157 endif 157 endif
158 158