diff -r 76baeda6e93a -r 4f8679a3077d jdk/make/lib/CoreLibraries.gmk
--- a/jdk/make/lib/CoreLibraries.gmk	Thu Apr 07 12:57:15 2016 -0700
+++ b/jdk/make/lib/CoreLibraries.gmk	Fri Apr 08 13:14:23 2016 +0200
@@ -289,7 +289,7 @@
 
 LIBJLI_CFLAGS := $(CFLAGS_JDKLIB)
 
-ifeq ($(JVM_VARIANT_ZERO), true)
+ifeq ($(call check-jvm-variant, zero zeroshark), true)
   ERGO_FAMILY := zero
 else
   ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)