comparison make/linux/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 126ea7725993
comparison
equal deleted inserted replaced
1641:5087ecc10458 1642:0e7d2a08b605
38 GENERATED = $(TOPDIR)/../generated 38 GENERATED = $(TOPDIR)/../generated
39 39
40 # tools.jar is needed by the JDI - SA binding 40 # tools.jar is needed by the JDI - SA binding
41 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar 41 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
42 42
43 # TODO: if it's a modules image, check if SA module is installed.
44 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
45
43 # gnumake 3.78.1 does not accept the *s that 46 # gnumake 3.78.1 does not accept the *s that
44 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them 47 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
45 AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) 48 AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
46 AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) 49 AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
47 50
63 $(QUIETLY) echo "Making $@" 66 $(QUIETLY) echo "Making $@"
64 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 67 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
65 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 68 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
66 exit 1; \ 69 exit 1; \
67 fi 70 fi
68 $(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \ 71 $(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \
69 echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\ 72 echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
70 echo ""; \ 73 echo ""; \
71 exit 1; \ 74 exit 1; \
72 fi 75 fi
73 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ 76 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \