diff options
| author | trims <none@none> | 2010-07-15 19:52:58 -0700 |
|---|---|---|
| committer | trims <none@none> | 2010-07-15 19:52:58 -0700 |
| commit | 4464a461ff62c64cd6001025adfc2078a73a7c3e (patch) | |
| tree | f38834b970572ecc24612f90ff5a441d56163eeb /make | |
| parent | 3dee83a487f29ff2bd512f9582c7b2e17915d19d (diff) | |
| parent | 80274d7487d04efe38a2e9c478cea371aadbb38b (diff) | |
Mergehs19-b04
Diffstat (limited to 'make')
| -rw-r--r-- | make/linux/makefiles/sa.make | 5 | ||||
| -rw-r--r-- | make/solaris/makefiles/sa.make | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/make/linux/makefiles/sa.make b/make/linux/makefiles/sa.make index 153c65770..f7a1a208b 100644 --- a/make/linux/makefiles/sa.make +++ b/make/linux/makefiles/sa.make @@ -40,6 +40,9 @@ GENERATED = $(TOPDIR)/../generated # 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)) @@ -65,7 +68,7 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) 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; \ diff --git a/make/solaris/makefiles/sa.make b/make/solaris/makefiles/sa.make index a5eb4770d..8d4313b6e 100644 --- a/make/solaris/makefiles/sa.make +++ b/make/solaris/makefiles/sa.make @@ -36,6 +36,9 @@ GENERATED = ../generated # 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 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) 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; \ |