summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYiyangWu <xgreenlandforwyy@gmail.com>2022-03-06 22:33:37 +0800
committerBenda Xu <heroxbd@gentoo.org>2022-03-27 11:34:18 +0800
commitcb2eea1c99a890daa3713835f8552d067ecee2c7 (patch)
tree723fa6fc51dac2f627677cb62b7328c402f4f3a3 /sys-devel
parentdev-util/hip: move opengl header dependence to DEPEND. (diff)
downloadgentoo-cb2eea1c99a890daa3713835f8552d067ecee2c7.tar.gz
gentoo-cb2eea1c99a890daa3713835f8552d067ecee2c7.tar.bz2
gentoo-cb2eea1c99a890daa3713835f8552d067ecee2c7.zip
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@gmail.com> Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch9
-rw-r--r--sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch9
2 files changed, 18 insertions, 0 deletions
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 <xgreenlandforwyy@gmail.com>
}
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 <xgreenlandforwyy@gmail.com>
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 @@
}