diff --git a/arch/Kconfig b/arch/Kconfig
index 49b9332611..079776bd28 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -283,7 +283,6 @@ config ARCH_SIZET_LONG
 
 config ARCH_COVERAGE
 	bool "Enable code coverage analysis"
-	select HAVE_CXX
 	select HAVE_CXXINITIALIZE
 	default n
 	---help---
diff --git a/libs/libxx/Kconfig b/libs/libxx/Kconfig
index 29a33626ed..600ceb0ce7 100644
--- a/libs/libxx/Kconfig
+++ b/libs/libxx/Kconfig
@@ -20,6 +20,14 @@ config HAVE_CXX
 		Toolchain supports C++ and CXX, CXXFLAGS, and COMPILEXX have been
 		defined in the configurations Make.defs file.
 
+config HAVE_CXXINITIALIZE
+	bool "Have C++ initialization"
+	default n
+	---help---
+		The platform-specific logic includes support for initialization
+		of static C++ instances for this architecture and for the selected
+		toolchain.
+
 if HAVE_CXX
 
 choice
@@ -35,6 +43,7 @@ config LIBCXXMINI
 
 config LIBCXX
 	bool "LLVM libc++ C++ Standard Library"
+	select HAVE_CXXINITIALIZE
 	select LIBC_WCHAR
 	select LIBC_LOCALE
 	---help---
@@ -43,6 +52,7 @@ config LIBCXX
 
 config UCLIBCXX
 	bool "uClibc++ Standard C++ Library"
+	select HAVE_CXXINITIALIZE
 	---help---
 		uClibc++ C++ library
 		https://cxx.uclibc.org/
@@ -72,14 +82,6 @@ endchoice
 
 endif
 
-config HAVE_CXXINITIALIZE
-	bool "Have C++ initialization"
-	default LIBCXX || UCLIBCXX
-	---help---
-		The platform-specific logic includes support for initialization
-		of static C++ instances for this architecture and for the selected
-		toolchain (via up_cxxinitialize()).
-
 config CXX_EXCEPTION
 	bool "Enable Exception Support"