4 files changed, 12 insertions, 8 deletions
diff --git a/llvm-runtimes/libcxx/libcxx-19.1.7.ebuild b/llvm-runtimes/libcxx/libcxx-19.1.7.ebuild
index 00dd72b37153..c5649f641a28 100644
--- a/llvm-runtimes/libcxx/libcxx-19.1.7.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-19.1.7.ebuild
@@ -65,8 +65,6 @@ test_compiler() {
 }
 
 src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
 	local install_prefix=${EPREFIX}
 	is_crosspkg && install_prefix+=/usr/${CTARGET}
 
@@ -87,6 +85,7 @@ src_configure() {
 
 multilib_src_configure() {
 	if use clang; then
+		llvm_prepend_path -b "${LLVM_MAJOR}"
 		local -x CC=${CTARGET}-clang
 		local -x CXX=${CTARGET}-clang++
 		strip-unsupported-flags
@@ -114,6 +113,8 @@ multilib_src_configure() {
 
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
 		-DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DLLVM_ENABLE_RUNTIMES=libcxx
diff --git a/llvm-runtimes/libcxx/libcxx-20.1.8.ebuild b/llvm-runtimes/libcxx/libcxx-20.1.8.ebuild
index 3b1f3f487fa0..ac2a1dba2e07 100644
--- a/llvm-runtimes/libcxx/libcxx-20.1.8.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-20.1.8.ebuild
@@ -67,8 +67,6 @@ test_compiler() {
 }
 
 src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
 	local install_prefix=${EPREFIX}
 	is_crosspkg && install_prefix+=/usr/${CTARGET}
 
@@ -89,6 +87,7 @@ src_configure() {
 
 multilib_src_configure() {
 	if use clang; then
+		llvm_prepend_path -b "${LLVM_MAJOR}"
 		local -x CC=${CTARGET}-clang
 		local -x CXX=${CTARGET}-clang++
 		strip-unsupported-flags
@@ -116,6 +115,8 @@ multilib_src_configure() {
 
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
 		-DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DLLVM_ENABLE_RUNTIMES=libcxx
diff --git a/llvm-runtimes/libcxx/libcxx-21.1.0.9999.ebuild b/llvm-runtimes/libcxx/libcxx-21.1.0.9999.ebuild
index 940a5893f521..935dea8bfb0f 100644
--- a/llvm-runtimes/libcxx/libcxx-21.1.0.9999.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-21.1.0.9999.ebuild
@@ -66,8 +66,6 @@ test_compiler() {
 }
 
 src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
 	local install_prefix=${EPREFIX}
 	is_crosspkg && install_prefix+=/usr/${CTARGET}
 
@@ -88,6 +86,7 @@ src_configure() {
 
 multilib_src_configure() {
 	if use clang; then
+		llvm_prepend_path -b "${LLVM_MAJOR}"
 		local -x CC=${CTARGET}-clang
 		local -x CXX=${CTARGET}-clang++
 		strip-unsupported-flags
@@ -115,6 +114,8 @@ multilib_src_configure() {
 
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
 		-DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DLLVM_ENABLE_RUNTIMES=libcxx
diff --git a/llvm-runtimes/libcxx/libcxx-22.0.0.9999.ebuild b/llvm-runtimes/libcxx/libcxx-22.0.0.9999.ebuild
index 940a5893f521..935dea8bfb0f 100644
--- a/llvm-runtimes/libcxx/libcxx-22.0.0.9999.ebuild
+++ b/llvm-runtimes/libcxx/libcxx-22.0.0.9999.ebuild
@@ -66,8 +66,6 @@ test_compiler() {
 }
 
 src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
 	local install_prefix=${EPREFIX}
 	is_crosspkg && install_prefix+=/usr/${CTARGET}
 
@@ -88,6 +86,7 @@ src_configure() {
 
 multilib_src_configure() {
 	if use clang; then
+		llvm_prepend_path -b "${LLVM_MAJOR}"
 		local -x CC=${CTARGET}-clang
 		local -x CXX=${CTARGET}-clang++
 		strip-unsupported-flags
@@ -115,6 +114,8 @@ multilib_src_configure() {
 
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
 		-DCMAKE_CXX_COMPILER_TARGET="${CTARGET}"
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DLLVM_ENABLE_RUNTIMES=libcxx