[gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/

[Michał Górny]

commit:     75a5ec6e3daef1841d084314e971d92cad37e756
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  8 10:03:45 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 10:34:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a5ec6e

sys-libs/libomp: Fix finding llvm-link when using compiler shadow

Pass the path to llvm-link explicitly in order to fix finding it when
the compiler directory is different than llvm-link directory.  This
happens e.g. when ccache is being used.

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

 sys-libs/libomp/{libomp-13.0.0.ebuild => libomp-13.0.0-r1.ebuild} | 3 +++
 sys-libs/libomp/libomp-13.0.0.9999.ebuild                         | 3 +++
 sys-libs/libomp/libomp-14.0.0.9999.ebuild                         | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/sys-libs/libomp/libomp-13.0.0.ebuild 
b/sys-libs/libomp/libomp-13.0.0-r1.ebuild
similarity index 95%
rename from sys-libs/libomp/libomp-13.0.0.ebuild
rename to sys-libs/libomp/libomp-13.0.0-r1.ebuild
index 980686f9e84..9009d8a8295 100644
--- a/sys-libs/libomp/libomp-13.0.0.ebuild
+++ b/sys-libs/libomp/libomp-13.0.0-r1.ebuild
@@ -103,6 +103,9 @@ multilib_src_configure() {
                -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
                # a cheap hack to force clang
                -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
+               # upstream defaults to looking for it in clang dir
+               # this fails when ccache is being used
+               -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
        )
        use test && mycmakeargs+=(
                # this project does not use standard LLVM cmake macros

diff --git a/sys-libs/libomp/libomp-13.0.0.9999.ebuild 
b/sys-libs/libomp/libomp-13.0.0.9999.ebuild
index c16560830be..8ff1b93cd2f 100644
--- a/sys-libs/libomp/libomp-13.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-13.0.0.9999.ebuild
@@ -102,6 +102,9 @@ multilib_src_configure() {
                -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
                # a cheap hack to force clang
                -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
+               # upstream defaults to looking for it in clang dir
+               # this fails when ccache is being used
+               -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
        )
        use test && mycmakeargs+=(
                # this project does not use standard LLVM cmake macros

diff --git a/sys-libs/libomp/libomp-14.0.0.9999.ebuild 
b/sys-libs/libomp/libomp-14.0.0.9999.ebuild
index c16560830be..8ff1b93cd2f 100644
--- a/sys-libs/libomp/libomp-14.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-14.0.0.9999.ebuild
@@ -102,6 +102,9 @@ multilib_src_configure() {
                -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
                # a cheap hack to force clang
                -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
+               # upstream defaults to looking for it in clang dir
+               # this fails when ccache is being used
+               -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
        )
        use test && mycmakeargs+=(
                # this project does not use standard LLVM cmake macros