sys-devel/llvm: use correct libtool on macos prefix

Bug: https://bugs.gentoo.org/924839
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/35613
Signed-off-by: Sam James <sam@gentoo.org>

6 files changed, 30 insertions, 18 deletions

diff --git a/sys-devel/llvm/llvm-17.0.6.ebuild b/sys-devel/llvm/llvm-17.0.6.ebuild
index 8a87d9e2e08f..c5159086d72c 100644
--- a/sys-devel/llvm/llvm-17.0.6.ebuild
+++ b/sys-devel/llvm/llvm-17.0.6.ebuild
@@ -439,11 +439,13 @@ multilib_src_configure() {
 		)
 	fi
 
-	# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-	# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-	# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 	use kernel_Darwin && mycmakeargs+=(
+		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
+		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
+		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 		-DTerminfo_LIBRARIES=-lncurses
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
 	)
 
 	# LLVM can have very high memory consumption while linking,
diff --git a/sys-devel/llvm/llvm-18.1.0_rc3.ebuild b/sys-devel/llvm/llvm-18.1.0_rc3.ebuild
index 55ced7c14db1..5031f93dd455 100644
--- a/sys-devel/llvm/llvm-18.1.0_rc3.ebuild
+++ b/sys-devel/llvm/llvm-18.1.0_rc3.ebuild
@@ -444,11 +444,13 @@ multilib_src_configure() {
 		)
 	fi
 
-	# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-	# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-	# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 	use kernel_Darwin && mycmakeargs+=(
+		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
+		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
+		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 		-DTerminfo_LIBRARIES=-lncurses
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
 	)
 
 	# LLVM can have very high memory consumption while linking,
diff --git a/sys-devel/llvm/llvm-18.1.0_rc4.ebuild b/sys-devel/llvm/llvm-18.1.0_rc4.ebuild
index 55ced7c14db1..5031f93dd455 100644
--- a/sys-devel/llvm/llvm-18.1.0_rc4.ebuild
+++ b/sys-devel/llvm/llvm-18.1.0_rc4.ebuild
@@ -444,11 +444,13 @@ multilib_src_configure() {
 		)
 	fi
 
-	# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-	# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-	# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 	use kernel_Darwin && mycmakeargs+=(
+		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
+		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
+		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 		-DTerminfo_LIBRARIES=-lncurses
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
 	)
 
 	# LLVM can have very high memory consumption while linking,
diff --git a/sys-devel/llvm/llvm-19.0.0.9999.ebuild b/sys-devel/llvm/llvm-19.0.0.9999.ebuild
index 55ced7c14db1..5031f93dd455 100644
--- a/sys-devel/llvm/llvm-19.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-19.0.0.9999.ebuild
@@ -444,11 +444,13 @@ multilib_src_configure() {
 		)
 	fi
 
-	# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-	# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-	# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 	use kernel_Darwin && mycmakeargs+=(
+		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
+		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
+		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 		-DTerminfo_LIBRARIES=-lncurses
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
 	)
 
 	# LLVM can have very high memory consumption while linking,
diff --git a/sys-devel/llvm/llvm-19.0.0_pre20240224.ebuild b/sys-devel/llvm/llvm-19.0.0_pre20240224.ebuild
index 55ced7c14db1..5031f93dd455 100644
--- a/sys-devel/llvm/llvm-19.0.0_pre20240224.ebuild
+++ b/sys-devel/llvm/llvm-19.0.0_pre20240224.ebuild
@@ -444,11 +444,13 @@ multilib_src_configure() {
 		)
 	fi
 
-	# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-	# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-	# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 	use kernel_Darwin && mycmakeargs+=(
+		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
+		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
+		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 		-DTerminfo_LIBRARIES=-lncurses
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
 	)
 
 	# LLVM can have very high memory consumption while linking,
diff --git a/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild b/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild
index 55ced7c14db1..5031f93dd455 100644
--- a/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild
+++ b/sys-devel/llvm/llvm-19.0.0_pre20240302.ebuild
@@ -444,11 +444,13 @@ multilib_src_configure() {
 		)
 	fi
 
-	# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
-	# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
-	# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 	use kernel_Darwin && mycmakeargs+=(
+		# On Macos prefix, Gentoo doesn't split sys-libs/ncurses to libtinfo and
+		# libncurses, but llvm tries to use libtinfo before libncurses, and ends up
+		# using libtinfo (actually, libncurses.dylib) from system instead of prefix
 		-DTerminfo_LIBRARIES=-lncurses
+		# Use our libtool instead of looking it up with xcrun
+		-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
 	)
 
 	# LLVM can have very high memory consumption while linking,