Mercurial > hg > truffle

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/make/solaris/makefiles/sa.make	Wed Jul 07 14:12:08 2010 -0400
+++ b/make/solaris/makefiles/sa.make	Wed Jul 07 15:35:58 2010 -0700
@@ -36,6 +36,9 @@
 # tools.jar is needed by the JDI - SA binding
 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
 
+# TODO: if it's a modules image, check if SA module is installed.
+MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
+
 # gnumake 3.78.1 does not accept the *s that
 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
 AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
@@ -59,7 +62,7 @@
 	   echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
 	   exit 1; \
 	fi
-	$(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \
+	$(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \
 	  echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
 	  echo ""; \
 	  exit 1; \