Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8066589: Make importing sa-jdi.jar optional on its existance
authorsimonis
Wed, 10 Dec 2014 18:31:24 +0100
changeset 27953 03e0e3891572
parent 27952 38cbc8b0395b
child 27954 d2c87a8d2f37
child 27955 8d98ed07bc28
8066589: Make importing sa-jdi.jar optional on its existance Summary: Also fix the location where libjli_static.a is loaded from on AIX Reviewed-by: erikj, dsamersoff
jdk/make/Import.gmk file | annotate | diff | comparison | revisions
jdk/make/gensrc/Gensrc-jdk.jdi.gmk file | annotate | diff | comparison | revisions
jdk/make/launcher/LauncherCommon.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/Import.gmk	Wed Dec 10 15:01:26 2014 +0000
+++ b/jdk/make/Import.gmk	Wed Dec 10 18:31:24 2014 +0100
@@ -221,8 +221,13 @@
 # even if zip is already unpacked.
 $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services: $(HOTSPOT_DIST)/lib/sa-jdi.jar
 
-SA_TARGETS += $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/_the.sa.jar.unpacked \
-    $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
+# Some platforms don't have the serviceability agent
+ifeq (, $(filter $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), aix-ppc64))
+  ifneq ($(JVM_VARIANT_ZERO), true)
+    SA_TARGETS += $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/_the.sa.jar.unpacked \
+        $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
+  endif
+endif
 
 ################################################################################
 
--- a/jdk/make/gensrc/Gensrc-jdk.jdi.gmk	Wed Dec 10 15:01:26 2014 +0000
+++ b/jdk/make/gensrc/Gensrc-jdk.jdi.gmk	Wed Dec 10 18:31:24 2014 +0100
@@ -78,8 +78,13 @@
     $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector
 	$(install-file)
 
-GENSRC_JDK_JDI += $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \
-    $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector
+# Some platforms don't have the serviceability agent
+ifeq (, $(filter $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), aix-ppc64))
+  ifneq ($(JVM_VARIANT_ZERO), true)
+    GENSRC_JDK_JDI += $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \
+        $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector
+  endif
+endif
 
 ################################################################################
 
--- a/jdk/make/launcher/LauncherCommon.gmk	Wed Dec 10 15:01:26 2014 +0000
+++ b/jdk/make/launcher/LauncherCommon.gmk	Wed Dec 10 18:31:24 2014 +0100
@@ -116,7 +116,7 @@
   endif
 
   ifeq ($(OPENJDK_TARGET_OS), aix)
-    $1_LDFLAGS_SUFFIX += -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE) -ljli_static
+    $1_LDFLAGS_SUFFIX += -L$(SUPPORT_OUTPUTDIR)/native/java.base -ljli_static
   endif
 
   ifeq ($(USE_EXTERNAL_LIBZ), true)
jdk-sandbox