Mercurial > hg > truffle
comparison make/linux/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 | da0999c4b733 f08d439fab8c |
comparison
equal
deleted
inserted
replaced
3845:c96c3eb1efae | 3846:4aa5974a06dd |
---|---|
122 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html | 122 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html |
123 | 123 |
124 # client and server subdirectories have symbolic links to ../libjsig.so | 124 # client and server subdirectories have symbolic links to ../libjsig.so |
125 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so | 125 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so |
126 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server | 126 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server |
127 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client | |
127 | 128 |
128 ifndef BUILD_CLIENT_ONLY | 129 ifndef BUILD_CLIENT_ONLY |
129 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt | 130 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
130 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so | 131 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so |
131 endif | 132 endif |
132 | 133 |
133 ifneq ($(ZERO_BUILD), true) | 134 ifneq ($(ZERO_BUILD), true) |
134 ifeq ($(ARCH_DATA_MODEL), 32) | 135 ifeq ($(ARCH_DATA_MODEL), 32) |
135 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client | |
136 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt | 136 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt |
137 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so | 137 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so |
138 endif | 138 endif |
139 endif | 139 endif |
140 | 140 |