diff options
| author | Sam James <sam@gentoo.org> | 2024-12-12 04:32:34 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-12-12 04:37:16 +0000 |
| commit | aec36c6fbd87fab890fc4e53fe7c39dee49fdda5 (patch) | |
| tree | 6112159f74df69db3d87562f3e95a61dbce96753 /llvm-core/clang/clang-19.1.5.ebuild | |
| parent | 73e247edb11e13ed744cbd65a915b59fdc827cda (diff) | |
| download | gentoo-aec36c6fbd87fab890fc4e53fe7c39dee49fdda5.tar.gz gentoo-aec36c6fbd87fab890fc4e53fe7c39dee49fdda5.tar.bz2 gentoo-aec36c6fbd87fab890fc4e53fe7c39dee49fdda5.zip | |
llvm-core/clang: drop llvm_prepend_path use
The hackery with PATH here is wrong and it breaks building Clang itself
with a different version of Clang (which is why we're looking at rejigging
how the eclass works/replacing it with llvm-r1.eclass [0]).
As suggested by Matt, use LLVM_CMAKE_DIR instead so that Clang finds
the right version of LLVM to build against without any sort of nonsense
messing with build tooling.
[0] https://public-inbox.gentoo.org/gentoo-dev/d5489fa24ef3d1129540879e628120addb3af8ce.camel@gentoo.org/
Closes: https://bugs.gentoo.org/942314
Closes: https://bugs.gentoo.org/944788
Thanks-to: Matt Whitlock <gentoo@mattwhitlock.name>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'llvm-core/clang/clang-19.1.5.ebuild')
| -rw-r--r-- | llvm-core/clang/clang-19.1.5.ebuild | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm-core/clang/clang-19.1.5.ebuild b/llvm-core/clang/clang-19.1.5.ebuild index dd0c7132c2d2..c994c37fe3eb 100644 --- a/llvm-core/clang/clang-19.1.5.ebuild +++ b/llvm-core/clang/clang-19.1.5.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake llvm.org llvm-utils multilib multilib-minimal +inherit cmake llvm.org multilib multilib-minimal inherit prefix python-single-r1 toolchain-funcs DESCRIPTION="C language family frontend for LLVM" @@ -254,12 +254,11 @@ get_distribution_components() { } multilib_src_configure() { - llvm_prepend_path "${LLVM_MAJOR}" - local mycmakeargs=( -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}") -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" + -DLLVM_CMAKE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/cmake" -DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang" # relative to bindir -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}" |