--- old/make/hotspot/lib/JvmFeatures.gmk	2018-06-01 22:29:44.780471061 +0200
+++ new/make/hotspot/lib/JvmFeatures.gmk	2018-06-01 22:29:44.528460183 +0200
@@ -155,6 +155,11 @@
   JVM_EXCLUDE_FILES += psMarkSweep.cpp psMarkSweepDecorator.cpp
 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