diff -r 7a2a740815b7 -r caf115bb98ad make/hotspot/lib/JvmFeatures.gmk
--- a/make/hotspot/lib/JvmFeatures.gmk	Tue May 15 11:28:29 2018 -0700
+++ b/make/hotspot/lib/JvmFeatures.gmk	Tue May 15 20:24:34 2018 +0200
@@ -154,6 +154,12 @@
   # If serial is disabled, we cannot use serial as OldGC in parallel
   JVM_EXCLUDE_FILES += psMarkSweep.cpp psMarkSweepDecorator.cpp
 endif
+
+ifneq ($(call check-jvm-feature, jfr), true)
+  JVM_CFLAGS_FEATURES += -DINCLUDE_JFR=0
+  JVM_EXCLUDE_PATTERNS += jfr
+endif
+
 ################################################################################
 
 ifeq ($(call check-jvm-feature, link-time-opt), true)