From aef1250a4137a42ecc7d0048eaf5156628bd599a Mon Sep 17 00:00:00 2001 From: cjatin Date: Wed, 20 Oct 2021 13:59:25 +0530 Subject: [PATCH] SWDEV-303745 - SWDEV-307757 - SWDEV-308024 - SWDEV-308834 - Find clangrt lib using find_library Change-Id: Ia311e9f10c59f21c271e83f09fa84eb65e95105a --- hipamd/hip-config.cmake.in | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/hipamd/hip-config.cmake.in b/hipamd/hip-config.cmake.in index 07a11ce13b..6116d0877a 100755 --- a/hipamd/hip-config.cmake.in +++ b/hipamd/hip-config.cmake.in @@ -270,16 +270,21 @@ if(HIP_COMPILER STREQUAL "clang") endif() endif() - file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/lib/*") - find_library(CLANGRT_BUILTINS NAMES clang_rt.builtins PATHS ${HIP_CLANGRT_LIB_SEARCH_PATHS}) + file(GLOB HIP_CLANGRT_LIB_SEARCH_PATHS "${HIP_CLANG_ROOT}/lib/clang/*/lib/*") + find_library(CLANGRT_BUILTINS + NAMES + clang_rt.builtins + clang_rt.builtins-x86_64 + PATHS + ${HIP_CLANGRT_LIB_SEARCH_PATHS} + ${HIP_CLANG_INCLUDE_PATH}/../lib/linux) # Add support for __fp16 and _Float16, explicitly link with compiler-rt if(CLANGRT_BUILTINS-NOTFOUND) - hip_add_interface_link_flags(hip::host -L\"${HIP_CLANG_INCLUDE_PATH}/../lib/linux\" -lclang_rt.builtins-x86_64) - hip_add_interface_link_flags(hip::device -L\"${HIP_CLANG_INCLUDE_PATH}/../lib/linux\" -lclang_rt.builtins-x86_64) + message(FATAL_ERROR "clangrt builtins lib not found") else() - set_property(TARGET hip::host APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${CLANGRT_BUILTINS}>") - set_property(TARGET hip::device APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${CLANGRT_BUILTINS}>") + set_property(TARGET hip::host APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}") + set_property(TARGET hip::device APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}") endif() endif()