[gentoo-commits] repo/gentoo:master commit in: llvm-runtimes/flang-rt/

[Michał Górny]

commit:     86ce1f69850acdde18d3fb5ab0fcd8cf66b8f1b7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 15 10:04:09 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 10:15:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ce1f69

llvm-runtimes/flang-rt: Install to clang-resource-dir

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 llvm-runtimes/flang-rt/flang-rt-21.0.0.9999.ebuild | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/llvm-runtimes/flang-rt/flang-rt-21.0.0.9999.ebuild 
b/llvm-runtimes/flang-rt/flang-rt-21.0.0.9999.ebuild
index 30245857a84e..f8d5699c2667 100644
--- a/llvm-runtimes/flang-rt/flang-rt-21.0.0.9999.ebuild
+++ b/llvm-runtimes/flang-rt/flang-rt-21.0.0.9999.ebuild
@@ -41,6 +41,9 @@ src_configure() {
                -DLLVM_ENABLE_RUNTIMES="flang-rt"
                # this package forces NO_DEFAULT_PATHS
                -DLLVM_BINARY_DIR="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+               # set correct install paths
+               -DFLANG_RT_INSTALL_RESOURCE_PATH="/usr/lib/clang/${LLVM_MAJOR}"
+               -DLLVM_DEFAULT_TARGET_TRIPLE="${CHOST}"
 
                -DFLANG_RT_INCLUDE_TESTS=$(usex test)
        )
@@ -59,14 +62,3 @@ src_test() {
        local -x LIT_PRESERVES_TMP=1
        cmake_build check-flang-rt
 }
-
-src_install() {
-       cmake_src_install
-
-       # in standalone build, the library is installed to (incorrect) resource 
dir
-       # but the driver only looks for it in lib (sigh)
-       # https://github.com/llvm/llvm-project/issues/127538
-       mkdir -p "${ED}/usr/lib/llvm/${LLVM_MAJOR}" || die
-       mv "${ED}/usr/$(get_libdir)/clang/${LLVM_MAJOR}/lib"/* \
-               "${ED}/usr/lib/llvm/${LLVM_MAJOR}/lib" || die
-}