From c2df7329a88b079240f211e776af2d8f7030e346 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 15 Jun 2026 07:27:05 +0000
Subject: [PATCH] 8385817: Headless jdk still contains bin/jconsole

Reviewed-by: erikj, syan, kevinw
---
 make/modules/jdk.jconsole/Launcher.gmk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/make/modules/jdk.jconsole/Launcher.gmk b/make/modules/jdk.jconsole/Launcher.gmk
index 7cb40a1b13a..adb3b05c400 100644
--- a/make/modules/jdk.jconsole/Launcher.gmk
+++ b/make/modules/jdk.jconsole/Launcher.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,15 +30,15 @@ include LauncherCommon.gmk
 ################################################################################
 ## Build jconsole
 ################################################################################
-
-$(eval $(call SetupBuildLauncher, jconsole, \
-    MAIN_CLASS := sun.tools.jconsole.JConsole, \
-    JAVA_ARGS := \
-        --add-opens java.base/java.io=jdk.jconsole \
-        --add-modules ALL-DEFAULT \
-        -Djconsole.showOutputViewer \
-        -Djdk.attach.allowAttachSelf=true, \
-    WINDOWS_JAVAW := true, \
-))
-
+ifneq ($(ENABLE_HEADLESS_ONLY), true)
+  $(eval $(call SetupBuildLauncher, jconsole, \
+      MAIN_CLASS := sun.tools.jconsole.JConsole, \
+      JAVA_ARGS := \
+          --add-opens java.base/java.io=jdk.jconsole \
+          --add-modules ALL-DEFAULT \
+          -Djconsole.showOutputViewer \
+          -Djdk.attach.allowAttachSelf=true, \
+      WINDOWS_JAVAW := true, \
+  ))
+endif
 ################################################################################