From 177b978f71c0c8e360426d1aecabe5d76f18ee56 Mon Sep 17 00:00:00 2001 From: Siu Chi Chan Date: Thu, 17 Feb 2022 17:29:21 -0500 Subject: [PATCH] hip-config.cmake - resolve HIP_CLANG_ROOT when the compiler is a symlink When the HIP compiler set to a symblink that was created outside /opt/rocm/llvm/bin, HIP's cmake would get HIP_CLANG_ROOT incorrectly. This teaches hip-config to get clang's real path first and use that to determine LLVM's directory. Change-Id: I6275b67f843aff256dc72cf478e575224e0cedc3 [ROCm/clr commit: e70d7374ef3369a0bea11b916ca5a5afb35dbac7] --- projects/clr/hipamd/hip-config.cmake.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/hip-config.cmake.in b/projects/clr/hipamd/hip-config.cmake.in index 77122b02c1..b860de3895 100755 --- a/projects/clr/hipamd/hip-config.cmake.in +++ b/projects/clr/hipamd/hip-config.cmake.in @@ -151,8 +151,9 @@ if(HIP_COMPILER STREQUAL "clang") get_filename_component(HIP_CLANG_ROOT "${CMAKE_MATCH_1}" DIRECTORY) endif() elseif (HIP_CXX_COMPILER MATCHES ".*clang\\+\\+") - get_filename_component(HIP_CLANG_ROOT "${HIP_CXX_COMPILER}" DIRECTORY) - get_filename_component(HIP_CLANG_ROOT "${HIP_CLANG_ROOT}" DIRECTORY) + get_filename_component(_HIP_CLANG_REAL_PATH "${HIP_CXX_COMPILER}" REALPATH) + get_filename_component(_HIP_CLANG_BIN_PATH "${_HIP_CLANG_REAL_PATH}" DIRECTORY) + get_filename_component(HIP_CLANG_ROOT "${_HIP_CLANG_BIN_PATH}" DIRECTORY) endif() file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS ${HIP_CLANG_ROOT}/lib/clang/*/include) find_path(HIP_CLANG_INCLUDE_PATH stddef.h