From 7bcde8fa251a0d295de4ff9e2d9705f5ef1f77a1 Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Sun, 10 Apr 2022 14:02:29 -0700
Subject: [PATCH] java/openjdk18: Fix build with Clang 14

---
 java/openjdk18/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile
index aa71d4e7d2a1..c077b1255c69 100644
--- a/java/openjdk18/Makefile
+++ b/java/openjdk18/Makefile
@@ -149,7 +149,12 @@ CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
 .else
 MAKE_ENV+=	USE_CLANG=true
 .if ${COMPILER_VERSION} >= 130
-CONFIGURE_ARGS+=	--with-extra-cflags="-Wno-unused-but-set-parameter"
+EXTRA_CFLAGS+=		-Wno-unused-but-set-parameter
+.if ${COMPILER_VERSION} >= 140
+EXTRA_CFLAGS+=		-Wno-bitwise-instead-of-logical
+.endif
+CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
+CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
 .endif
 .endif