--- a/make/hotspot/lib/JvmFeatures.gmk	Tue Jun 12 07:52:30 2018 -0700
+++ b/make/hotspot/lib/JvmFeatures.gmk	Tue Jun 12 17:40:28 2018 +0200
@@ -160,6 +160,11 @@
   JVM_EXCLUDE_PATTERNS += gc/epsilon
 endif
 
+ifneq ($(call check-jvm-feature, zgc), true)
+  JVM_CFLAGS_FEATURES += -DINCLUDE_ZGC=0
+  JVM_EXCLUDE_PATTERNS += gc/z
+endif
+
 ifneq ($(call check-jvm-feature, jfr), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_JFR=0
   JVM_EXCLUDE_PATTERNS += jfr