From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 80478158086 for ; Mon, 8 Nov 2021 10:34:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 312DA2BC0D4; Mon, 8 Nov 2021 10:34:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDB7C2BC0D4 for ; Mon, 8 Nov 2021 10:34:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A56EA341383 for ; Mon, 8 Nov 2021 10:34:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A32001A0 for ; Mon, 8 Nov 2021 10:34:33 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1636367667.75a5ec6e3daef1841d084314e971d92cad37e756.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libomp/libomp-13.0.0-r1.ebuild sys-libs/libomp/libomp-13.0.0.9999.ebuild sys-libs/libomp/libomp-13.0.0.ebuild sys-libs/libomp/libomp-14.0.0.9999.ebuild X-VCS-Directories: sys-libs/libomp/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 75a5ec6e3daef1841d084314e971d92cad37e756 X-VCS-Branch: master Date: Mon, 8 Nov 2021 10:34:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7a3dc7b3-2121-4637-87fd-d13f91a28c86 X-Archives-Hash: 22d388ff7f621525a685fd25e3617138 commit: 75a5ec6e3daef1841d084314e971d92cad37e756 Author: Michał Górny gentoo org> AuthorDate: Mon Nov 8 10:03:45 2021 +0000 Commit: Michał Górny gentoo 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 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