commit: cb2eea1c99a890daa3713835f8552d067ecee2c7 Author: YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com> AuthorDate: Sun Mar 6 14:33:37 2022 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Sun Mar 27 03:34:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2eea1c
sys-devel/llvm-roc: locate bitcode correctly This fixes clang not able to find rocm-device-libs when calling from rocm-comgr instead of commandline. Closes: https://bugs.gentoo.org/830762 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch | 9 +++++++++ sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch index 1fe93a33db36..f3d22b996915 100644 --- a/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch +++ b/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch @@ -143,6 +143,15 @@ Author: Yiyang Wu <[email protected]> } RocmInstallationDetector::RocmInstallationDetector( +@@ -397,7 +272,7 @@ void RocmInstallationDetector::detectDev + // - ${ROCM_ROOT}/lib/bitcode/* + // so try to detect these layouts. + static constexpr std::array<const char *, 2> SubDirsList[] = { +- {"amdgcn", "bitcode"}, ++ {"lib/amdgcn", "bitcode"}, + {"lib", ""}, + {"lib", "bitcode"}, + }; @@ -423,42 +298,7 @@ void RocmInstallationDetector::detectDev } diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch index 7b5714e610a7..f6f60cfb1b0f 100644 --- a/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch +++ b/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch @@ -142,6 +142,15 @@ Author: Yiyang Wu <[email protected]> return ROCmSearchDirs; } +@@ -397,7 +272,7 @@ void RocmInstallationDetector::detectDev + // - ${ROCM_ROOT}/lib/bitcode/* + // so try to detect these layouts. + static constexpr std::array<const char *, 2> SubDirsList[] = { +- {"amdgcn", "bitcode"}, ++ {"lib/amdgcn", "bitcode"}, + {"lib", ""}, + {"lib", "bitcode"}, + }; @@ -424,42 +298,7 @@ }
