--- old/make/hotspot/lib/JvmFeatures.gmk	2020-02-06 19:17:50.559551454 +0100
+++ new/make/hotspot/lib/JvmFeatures.gmk	2020-02-06 19:17:50.385551470 +0100
@@ -166,6 +166,11 @@
   JVM_EXCLUDE_PATTERNS += gc/z
 endif
 
+ifneq ($(call check-jvm-feature, shenandoahgc), true)
+  JVM_CFLAGS_FEATURES += -DINCLUDE_SHENANDOAHGC=0
+  JVM_EXCLUDE_PATTERNS += gc/shenandoah
+endif
+
 ifneq ($(call check-jvm-feature, jfr), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_JFR=0
   JVM_EXCLUDE_PATTERNS += jfr