From 43a81797b97c5f61edf09b80b0a7e0e60e0d1b9c Mon Sep 17 00:00:00 2001
From: Gengchen Tuo <gengchen.tuo@ibm.com>
Date: Tue, 10 Sep 2024 11:28:27 -0400
Subject: [PATCH] Enable JFR modules when JFR is enabled

Signed-off-by: Gengchen Tuo <gengchen.tuo@ibm.com>
---
 closed/custom/common/Modules.gmk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/closed/custom/common/Modules.gmk b/closed/custom/common/Modules.gmk
index 445fe5569f..8251d292a6 100644
--- a/closed/custom/common/Modules.gmk
+++ b/closed/custom/common/Modules.gmk
@@ -41,15 +41,20 @@ else
 	#
 endif
 
+ifeq (false,$(OPENJ9_ENABLE_JFR))
+  MODULES_FILTER += \
+	jdk.jfr \
+	jdk.management.jfr \
+	#
+endif
+
 MODULES_FILTER += \
 	jdk.aot \
 	jdk.hotspot.agent \
 	jdk.internal.vm.ci \
 	jdk.internal.vm.compiler \
 	jdk.internal.vm.compiler.management \
-	jdk.jfr \
 	jdk.jstatd \
-	jdk.management.jfr \
 	#
 
 TOP_SRC_DIRS += \