From f4f119792a6d497a8b144692f86ea7c756a3a1c3 Mon Sep 17 00:00:00 2001 From: Jatin Chaudhary Date: Mon, 29 Mar 2021 22:51:33 -0700 Subject: [PATCH] SWDEV-279372 - HIP_CLANG_PATH should resolve from HIP_PATH if its defined Change-Id: Iee909f1e2f3d6443b494846219ad955a1f0ebfe8 [ROCm/clr commit: 32498b61ffb600c58b720fdc00ae50c555b72959] --- projects/clr/hipamd/cmake/FindHIP.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/clr/hipamd/cmake/FindHIP.cmake b/projects/clr/hipamd/cmake/FindHIP.cmake index 27b2d254f6..7e391bf240 100644 --- a/projects/clr/hipamd/cmake/FindHIP.cmake +++ b/projects/clr/hipamd/cmake/FindHIP.cmake @@ -238,6 +238,8 @@ elseif("${HIP_COMPILER}" STREQUAL "clang") set(HIP_CLANG_PATH "$ENV{ROCM_PATH}/llvm/bin") elseif(DEFINED ENV{HIP_PATH}) set(HIP_CLANG_PATH "$ENV{HIP_PATH}/../llvm/bin") + elseif(DEFINED HIP_PATH) + set(HIP_CLANG_PATH "${HIP_PATH}/../llvm/bin") else() set(HIP_CLANG_PATH "/opt/rocm/llvm/bin") endif() @@ -655,6 +657,8 @@ macro(HIP_ADD_EXECUTABLE hip_target) set(HIP_CLANG_PATH "$ENV{ROCM_PATH}/llvm/bin") elseif(DEFINED ENV{HIP_PATH}) set(HIP_CLANG_PATH "$ENV{HIP_PATH}/../llvm/bin") + elseif(DEFINED HIP_PATH) + set(HIP_CLANG_PATH "${HIP_PATH}/../llvm/bin") else() set(HIP_CLANG_PATH "/opt/rocm/llvm/bin") endif()