--- old/make/gensrc/Gensrc-jdk.jdi.gmk	2015-01-07 21:18:28.362216893 +0100
+++ new/make/gensrc/Gensrc-jdk.jdi.gmk	2015-01-07 21:18:28.099216493 +0100
@@ -80,7 +80,7 @@
 
 # Some platforms don't have the serviceability agent
 ifeq (, $(filter $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), aix-ppc64))
-  ifneq ($(JVM_VARIANT_ZERO), true)
+  ifneq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), 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