1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
From: Cordell Bloor <cgmb@slerp.xyz>
Date: Sun, 18 Sep 2022 20:51:13 +0000
Subject: HIP_CLANG_PATH: add check for clang in /usr/bin
Forwarded: not-needed
---
hip/bin/hipvars.pm | 4 ++++
hip-config.cmake | 2 +-
2 file changed, 5 insertions(+), 1 deletion(-)
--- a/hipcc/bin/hipvars.pm
+++ b/hipcc/bin/hipvars.pm
@@ -87,7 +87,11 @@
if (-e "$HIP_PATH/bin/clang" or -e "$HIP_PATH/bin/clang.exe") {
$HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'} // "$HIP_PATH/bin";
} else {
+ if (-e "$ROCM_PATH/llvm/bin") {
$HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'} // "$ROCM_PATH/llvm/bin";
+ } else {
+ $HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'} // "$ROCM_PATH/bin";
+ }
}
# HIP_ROCCLR_HOME is used by Windows builds
$HIP_ROCCLR_HOME=$ENV{'HIP_ROCCLR_HOME'};
--- a/hipamd/hip-config-amd.cmake
+++ b/hipamd/hip-config-amd.cmake
@@ -57,7 +57,7 @@
file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT)
endif()
else()
- set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm")
+ set(HIP_CLANG_ROOT "/usr")
endif()
if(NOT HIP_CXX_COMPILER)
set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER})
|
