comparison make/solaris/makefiles/sa.make @ 1642:0e7d2a08b605

6967423: Hotspot support for modules image Summary: Add hotspot support for modules image Reviewed-by: acorn
author mchung
date Wed, 07 Jul 2010 15:35:58 -0700
parents c18cbe5936b8
children ea175c1b79ce
comparison
equal deleted inserted replaced
1641:5087ecc10458 1642:0e7d2a08b605
34 GENERATED = ../generated 34 GENERATED = ../generated
35 35
36 # tools.jar is needed by the JDI - SA binding 36 # tools.jar is needed by the JDI - SA binding
37 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar 37 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
38 38
39 # TODO: if it's a modules image, check if SA module is installed.
40 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
41
39 # gnumake 3.78.1 does not accept the *s that 42 # gnumake 3.78.1 does not accept the *s that
40 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them 43 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
41 AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) 44 AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
42 AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) 45 AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
43 46
57 $(QUIETLY) echo "Making $@"; 60 $(QUIETLY) echo "Making $@";
58 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 61 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
59 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 62 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
60 exit 1; \ 63 exit 1; \
61 fi 64 fi
62 $(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \ 65 $(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \
63 echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\ 66 echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
64 echo ""; \ 67 echo ""; \
65 exit 1; \ 68 exit 1; \
66 fi 69 fi
67 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ 70 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \