diff --git a/dev-db/mongodb/mongodb-6.0.19.ebuild b/dev-db/mongodb/mongodb-6.0.19.ebuild
index 1a185f9..2953004 100644
--- a/dev-db/mongodb/mongodb-6.0.19.ebuild
+++ b/dev-db/mongodb/mongodb-6.0.19.ebuild
@@ -44,11 +44,6 @@ RDEPEND="acct-group/mongodb
 	dev-libs/snowball-stemmer:=
 	net-misc/curl
 	>=sys-libs/zlib-1.2.12:=
-	clang? (
-		$(llvm_gen_dep "
-			sys-devel/clang:\${LLVM_SLOT}
-		")
-	)
 	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	ssl? (
 		>=dev-libs/openssl-1.0.1g:0=
@@ -59,6 +54,12 @@ DEPEND="${RDEPEND}
 	sys-libs/readline:0=
 	debug? ( dev-debug/valgrind )"
 BDEPEND="
+	clang? (
+		$(llvm_gen_dep "
+			sys-devel/clang:\${LLVM_SLOT}
+			sys-devel/llvm:\${LLVM_SLOT}
+		")
+	)
 	$(python_gen_any_dep '
 		>=dev-build/scons-3.1.1[${PYTHON_USEDEP}]
 		dev-python/cheetah3[${PYTHON_USEDEP}]
@@ -120,7 +121,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 	if use clang; then
 		llvm-r1_pkg_setup
-		llvm_fix_tool_path CC CXX
 	fi
 }
 
@@ -156,7 +156,7 @@ src_configure() {
 	)
 
 	local have_switched_compiler=
-	if use clang && ! tc-is-clang; then
+	if use clang && ! tc-is-clang || tc-is-clang; then
 		# Force clang
 		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
 		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")
diff --git a/dev-db/mongodb/mongodb-7.0.15.ebuild b/dev-db/mongodb/mongodb-7.0.15.ebuild
index 5c388fe..414db31 100644
--- a/dev-db/mongodb/mongodb-7.0.15.ebuild
+++ b/dev-db/mongodb/mongodb-7.0.15.ebuild
@@ -44,11 +44,6 @@ RDEPEND="acct-group/mongodb
 	dev-libs/snowball-stemmer:=
 	net-misc/curl
 	>=sys-libs/zlib-1.2.12:=
-	clang? (
-		$(llvm_gen_dep "
-			sys-devel/clang:\${LLVM_SLOT}
-		")
-	)
 	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	ssl? (
 		>=dev-libs/openssl-1.0.1g:0=
@@ -59,6 +54,12 @@ DEPEND="${RDEPEND}
 	sys-libs/readline:0=
 	debug? ( dev-debug/valgrind )"
 BDEPEND="
+	clang? (
+		$(llvm_gen_dep "
+			sys-devel/clang:\${LLVM_SLOT}
+			sys-devel/llvm:\${LLVM_SLOT}
+		")
+	)
 	$(python_gen_any_dep '
 		>=dev-build/scons-3.1.1[${PYTHON_USEDEP}]
 		dev-python/cheetah3[${PYTHON_USEDEP}]
@@ -113,7 +114,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 	if use clang; then
 		llvm-r1_pkg_setup
-		llvm_fix_tool_path CC CXX
 	fi
 }
 
@@ -149,7 +149,7 @@ src_configure() {
 	)
 
 	local have_switched_compiler=
-	if use clang && ! tc-is-clang; then
+	if use clang && ! tc-is-clang || tc-is-clang; then
 		# Force clang
 		local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
 		[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")