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 "$<$<LINK_LANGUAGE:HIP>:${CLANGRT_BUILTINS}>")
-    set_property(TARGET hip::device APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$<LINK_LANGUAGE:HIP>:${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()