From 922c988a8a9b0dec146b4f7a523891c3d569b874 Mon Sep 17 00:00:00 2001 From: Ioannis Assiouras Date: Thu, 13 Jul 2023 15:53:39 +0100 Subject: [PATCH] SWDEV-411086 - Provide path ROCM_PATH/llvm via the HINT argument instead of PATH in calls to find_package PATHS have lower priority than system paths so if there is a clang installation in /usr/local find_package(Clang) will pick that instead. To fix this provide the llvm path via the HINTS argument instead. Change-Id: I57794a9a5c5fc26f12c60798fbc8e826c1880e13 [ROCm/clr commit: 238b973a5a0cbeed769c77387540fccb6415f300] --- projects/clr/hipamd/src/hiprtc/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/src/hiprtc/CMakeLists.txt b/projects/clr/hipamd/src/hiprtc/CMakeLists.txt index 0ecdbb0a47..37ef8796fa 100644 --- a/projects/clr/hipamd/src/hiprtc/CMakeLists.txt +++ b/projects/clr/hipamd/src/hiprtc/CMakeLists.txt @@ -122,8 +122,8 @@ add_to_config(_versionInfo HIP_VERSION_GITHASH) # Enable preprocessed hiprtc-builtins library include(HIPRTC RESULT_VARIABLE HIPRTC_CMAKE) # Requires clang and llvm-mc to create this library. -find_package(LLVM REQUIRED CONFIG PATHS ${ROCM_PATH}/llvm) -find_package(Clang REQUIRED CONFIG PATHS ${ROCM_PATH}/llvm) +find_package(LLVM REQUIRED CONFIG HINTS ${ROCM_PATH}/llvm) +find_package(Clang REQUIRED CONFIG HINTS ${ROCM_PATH}/llvm) set(HIPRTC_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/hip_rtc_gen") set(HIPRTC_GEN_HEADER "${HIPRTC_GEN_DIR}/hipRTC_header.h") set(HIPRTC_GEN_MCIN "${HIPRTC_GEN_DIR}/hipRTC_header.mcin")