commit: d9cb99ac8e270f222b2f005ea508f7b877c35029
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 13:37:47 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 13:37:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9cb99ac
llvm-core/lld: Use LLVM_ROOT instead of PATH in 19.1.6+
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
llvm-core/lld/lld-19.1.6.ebuild | 5 ++---
llvm-core/lld/lld-20.0.0.9999.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/llvm-core/lld/lld-19.1.6.ebuild b/llvm-core/lld/lld-19.1.6.ebuild
index c0c93823f1c3..17bb40d57eb8 100644
--- a/llvm-core/lld/lld-19.1.6.ebuild
+++ b/llvm-core/lld/lld-19.1.6.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
DESCRIPTION="The LLVM linker (link editor)"
HOMEPAGE="https://llvm.org/";
@@ -57,8 +57,6 @@ src_unpack() {
}
src_configure() {
- llvm_prepend_path "${LLVM_MAJOR}"
-
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
@@ -66,6 +64,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-DBUILD_SHARED_LIBS=ON
-DLLVM_INCLUDE_TESTS=$(usex test)
-DLLVM_ENABLE_ZLIB=FORCE_ON
diff --git a/llvm-core/lld/lld-20.0.0.9999.ebuild
b/llvm-core/lld/lld-20.0.0.9999.ebuild
index d2c02ed66153..bf9436647cb3 100644
--- a/llvm-core/lld/lld-20.0.0.9999.ebuild
+++ b/llvm-core/lld/lld-20.0.0.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
DESCRIPTION="The LLVM linker (link editor)"
HOMEPAGE="https://llvm.org/";
@@ -56,8 +56,6 @@ src_unpack() {
}
src_configure() {
- llvm_prepend_path "${LLVM_MAJOR}"
-
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
@@ -65,6 +63,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-DBUILD_SHARED_LIBS=ON
-DLLVM_INCLUDE_TESTS=$(usex test)
-DLLVM_ENABLE_ZLIB=FORCE_ON
