comparison make/windows/makefiles/defs.make @ 3846:4aa5974a06dd

7075559: JPRT windows_x64 build failure Summary: use SA_CLASSDIR variable instead of dirsctory saclasses. Reviewed-by: kamg, dcubed
author kvn
date Sat, 06 Aug 2011 08:28:08 -0700
parents 0a8e0d4345b3
children f08d439fab8c
comparison
equal deleted inserted replaced
3845:c96c3eb1efae 3846:4aa5974a06dd
169 BUILD_WIN_SA = 0 169 BUILD_WIN_SA = 0
170 endif 170 endif
171 endif 171 endif
172 172
173 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server 173 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
174 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
175 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
176
174 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 177 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
175 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll 178 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll
176 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb 179 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
177 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map 180 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
178 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib 181 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
179 ifeq ($(ARCH_DATA_MODEL), 32) 182 ifeq ($(ARCH_DATA_MODEL), 32)
180 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
181 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 183 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
182 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll 184 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll
183 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb 185 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
184 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map 186 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
185 # kernel vm 187 # kernel vm
186 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
187 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt 188 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
188 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll 189 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll
189 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb 190 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
190 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map 191 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
191 endif 192 endif