git: ae31c10537ed - main - bsd.sys.mk: add NO_WCHARACTER_CONVERSION and use it for googletest
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Dec 2025 19:53:23 UTC
The branch main has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=ae31c10537edc1ed77a852e60bf3bd31fc38cba2
commit ae31c10537edc1ed77a852e60bf3bd31fc38cba2
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2025-12-25 20:05:51 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2025-12-28 19:50:42 +0000
bsd.sys.mk: add NO_WCHARACTER_CONVERSION and use it for googletest
This silences warnings about benign implicit character conversions in
googletest's gtest-printers.h.
---
lib/googletest/Makefile.inc | 3 +++
share/mk/bsd.sys.mk | 3 +++
share/mk/googletest.test.inc.mk | 3 +++
3 files changed, 9 insertions(+)
diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc
index 43ebace19a15..b1f7fa814166 100644
--- a/lib/googletest/Makefile.inc
+++ b/lib/googletest/Makefile.inc
@@ -10,3 +10,6 @@ CXXFLAGS+= ${GTESTS_FLAGS}
# Silence warnings about usage of deprecated implicit copy constructors
CXXWARNFLAGS+= -Wno-deprecated-copy
+
+# Silence warnings about implicit character conversions in gtest-printers.h
+CXXWARNFLAGS+= ${NO_WCHARACTER_CONVERSION}
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 50eb04b9fd15..c5f2c2bb783f 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -133,6 +133,9 @@ NO_WARRAY_PARAMETER= -Wno-array-parameter
NO_WSTRICT_PROTOTYPES= -Wno-strict-prototypes
NO_WDEPRECATED_NON_PROTOTYPE=-Wno-deprecated-non-prototype
.endif
+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 210000
+NO_WCHARACTER_CONVERSION=-Wno-character-conversion
+.endif
.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 50200
NO_WUNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable
.endif
diff --git a/share/mk/googletest.test.inc.mk b/share/mk/googletest.test.inc.mk
index 9ef5a3ceac00..5f4445e76205 100644
--- a/share/mk/googletest.test.inc.mk
+++ b/share/mk/googletest.test.inc.mk
@@ -10,3 +10,6 @@ GTESTS_CXXFLAGS+= -frtti
CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private
NO_WTHREAD_SAFETY=
+
+# Silence warnings about implicit character conversions in gtest-printers.h
+CXXWARNFLAGS+= ${NO_WCHARACTER_CONVERSION}