summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2024-12-18 15:04:49 +0100
committerMichał Górny <mgorny@gentoo.org>2024-12-18 15:04:49 +0100
commit3f6ce8ff31a5cd63b9dd9fe117abc5e2008f22b4 (patch)
tree722c917121aa51876f9611b6f1ad741e48173da5 /llvm-core
parentllvm-core/lld: Use LLVM_ROOT instead of PATH in 19.1.6+ (diff)
downloadgentoo-3f6ce8ff31a5cd63b9dd9fe117abc5e2008f22b4.tar.gz
gentoo-3f6ce8ff31a5cd63b9dd9fe117abc5e2008f22b4.tar.bz2
gentoo-3f6ce8ff31a5cd63b9dd9fe117abc5e2008f22b4.zip
llvm-core/lldb: Use LLVM_ROOT instead of PATH in 19.1.6+
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'llvm-core')
-rw-r--r--llvm-core/lldb/lldb-19.1.6.ebuild7
-rw-r--r--llvm-core/lldb/lldb-20.0.0.9999.ebuild7
2 files changed, 8 insertions, 6 deletions
diff --git a/llvm-core/lldb/lldb-19.1.6.ebuild b/llvm-core/lldb/lldb-19.1.6.ebuild
index 7dcc08c2d4d3..dd08468f9d99 100644
--- a/llvm-core/lldb/lldb-19.1.6.ebuild
+++ b/llvm-core/lldb/lldb-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-single-r1
+inherit cmake flag-o-matic llvm.org python-single-r1
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/"
@@ -53,8 +53,6 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
llvm.org_set_globals
src_configure() {
- llvm_prepend_path "${LLVM_MAJOR}"
-
# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
filter-lto
@@ -62,6 +60,9 @@ src_configure() {
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
local mycmakeargs=(
+ -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DClang_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
-DLLDB_ENABLE_CURSES=$(usex ncurses)
-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-DLLDB_ENABLE_PYTHON=$(usex python)
diff --git a/llvm-core/lldb/lldb-20.0.0.9999.ebuild b/llvm-core/lldb/lldb-20.0.0.9999.ebuild
index 97524be6f088..06c04e9dfe8a 100644
--- a/llvm-core/lldb/lldb-20.0.0.9999.ebuild
+++ b/llvm-core/lldb/lldb-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-single-r1
+inherit cmake flag-o-matic llvm.org python-single-r1
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/"
@@ -52,8 +52,6 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
llvm.org_set_globals
src_configure() {
- llvm_prepend_path "${LLVM_MAJOR}"
-
# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
filter-lto
@@ -61,6 +59,9 @@ src_configure() {
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
local mycmakeargs=(
+ -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DClang_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
-DLLDB_ENABLE_CURSES=$(usex ncurses)
-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-DLLDB_ENABLE_PYTHON=$(usex python)