SWDEV-330775 - Update search path for LLVM
ROCm's LLVM will be moved into /opt/rocm-<ver>/lib/, teach hipcc and
hipconfig about the new location.
Change-Id: Ie7f17146771aff94c684deb22148226cbb3a2895
[ROCm/clr commit: 3d15f9cbda]
This commit is contained in:
committed by
Mark Searles
parent
59c0ec10cc
commit
f31b0874fd
@@ -175,7 +175,7 @@ endif()
|
||||
if(__HIP_ENABLE_PCH)
|
||||
find_package(LLVM REQUIRED CONFIG
|
||||
PATHS
|
||||
${ROCM_PATH}/llvm)
|
||||
${ROCM_PATH}/llvm ${ROCM_PATH}/lib)
|
||||
# find_package(LLVM) returns the lib/cmake/llvm location. We require the root.
|
||||
if(NOT DEFINED HIP_LLVM_ROOT)
|
||||
set(HIP_LLVM_ROOT "${LLVM_DIR}/../../..")
|
||||
|
||||
@@ -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 PATHS ${ROCM_PATH}/llvm ${ROCM_PATH}/lib)
|
||||
find_package(Clang REQUIRED CONFIG PATHS ${ROCM_PATH}/llvm ${ROCM_PATH}/lib)
|
||||
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")
|
||||
|
||||
Reference in New Issue
Block a user