--- old/make/Import.gmk	2015-01-07 21:18:25.364212332 +0100
+++ new/make/Import.gmk	2015-01-07 21:18:25.003211783 +0100
@@ -223,7 +223,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)
     SA_TARGETS += $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/_the.sa.jar.unpacked \
         $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
   endif