Mercurial > hg > truffle
changeset 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 | c96c3eb1efae |
| children | a3142bdb6707 |
| files | make/linux/makefiles/defs.make make/solaris/makefiles/defs.make make/solaris/makefiles/saproc.make make/windows/makefiles/defs.make make/windows/makefiles/sa.make |
| diffstat | 5 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/defs.make Fri Jul 29 09:16:29 2011 -0700 +++ b/make/linux/makefiles/defs.make Sat Aug 06 08:28:08 2011 -0700 @@ -124,6 +124,7 @@ # client and server subdirectories have symbolic links to ../libjsig.so EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server +EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client ifndef BUILD_CLIENT_ONLY EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt @@ -132,7 +133,6 @@ ifneq ($(ZERO_BUILD), true) ifeq ($(ARCH_DATA_MODEL), 32) - EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so endif
--- a/make/solaris/makefiles/defs.make Fri Jul 29 09:16:29 2011 -0700 +++ b/make/solaris/makefiles/defs.make Sat Aug 06 08:28:08 2011 -0700 @@ -70,6 +70,8 @@ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server +EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client + ifneq ($(BUILD_CLIENT_ONLY),true) EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so @@ -77,7 +79,6 @@ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.so endif ifeq ($(ARCH_DATA_MODEL), 32) - EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so
--- a/make/solaris/makefiles/saproc.make Fri Jul 29 09:16:29 2011 -0700 +++ b/make/solaris/makefiles/saproc.make Sat Aug 06 08:28:08 2011 -0700 @@ -72,9 +72,9 @@ -e '/^[0-4]\. /b' \ -e '/^5\.[0-9] /b' \ -e '/^5\.10 /b' \ - -e '/ snv_[0-9][0-9]$/b' \ - -e '/ snv_[01][0-4][0-9]$/b' \ - -e '/ snv_15[0-8]$/b' \ + -e '/ snv_[0-9][0-9]$$/b' \ + -e '/ snv_[01][0-4][0-9]$$/b' \ + -e '/ snv_15[0-8]$$/b' \ -e 's/.*/-DSOLARIS_11_B159_OR_LATER/' \ -e 'p' \ )
--- a/make/windows/makefiles/defs.make Fri Jul 29 09:16:29 2011 -0700 +++ b/make/windows/makefiles/defs.make Sat Aug 06 08:28:08 2011 -0700 @@ -171,19 +171,20 @@ endif EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server +EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client +EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel + EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib ifeq ($(ARCH_DATA_MODEL), 32) - EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map # kernel vm - EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
--- a/make/windows/makefiles/sa.make Fri Jul 29 09:16:29 2011 -0700 +++ b/make/windows/makefiles/sa.make Sat Aug 06 08:28:08 2011 -0700 @@ -66,7 +66,7 @@ $(QUIETLY) mkdir $(SA_CLASSDIR)\sun\jvm\hotspot\ui\resources $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR) - $(RUN_JAR) cf $@ -C saclasses . + $(RUN_JAR) cf $@ -C $(SA_CLASSDIR) . $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext