diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2024-12-18 14:37:47 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2024-12-18 14:37:47 +0100 |
| commit | d9cb99ac8e270f222b2f005ea508f7b877c35029 (patch) | |
| tree | 907b6812c4206034d2fc8be13ed11363ac010aeb /llvm-core | |
| parent | llvm-core/clang: Replace LLVM_CMAKE_DIR with LLVM_ROOT in 19.1.6+ (diff) | |
| download | gentoo-d9cb99ac8e270f222b2f005ea508f7b877c35029.tar.gz gentoo-d9cb99ac8e270f222b2f005ea508f7b877c35029.tar.bz2 gentoo-d9cb99ac8e270f222b2f005ea508f7b877c35029.zip | |
llvm-core/lld: 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/lld/lld-19.1.6.ebuild | 5 | ||||
| -rw-r--r-- | 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 |