From 61db7b8ad09af8ea76498c6d3e80214ebd6ecbb1 Mon Sep 17 00:00:00 2001
From: Tao Sang <tao.sang@amd.com>
Date: Thu, 21 Jan 2021 12:55:03 -0500
Subject: [PATCH] SWDEV-257056 - Fix cyclic dependence of hip/rocclr libs

Solve upstream building failure due to the cyclic dependence.

Change-Id: Ibf34c789d5bd4278adcedba1d6e057639c258488


[ROCm/clr commit: 8cf28aa5b3d0e52a030e3d144df4fdd17e9cb929]
---
 projects/clr/hipamd/hip-config.cmake.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/projects/clr/hipamd/hip-config.cmake.in b/projects/clr/hipamd/hip-config.cmake.in
index 80373ce3b4..1e0193f9fa 100644
--- a/projects/clr/hipamd/hip-config.cmake.in
+++ b/projects/clr/hipamd/hip-config.cmake.in
@@ -127,6 +127,14 @@ if(HIP_RUNTIME MATCHES "rocclr")
     INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
     INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
   )
+
+  get_target_property(amdhip64_type hip::amdhip64 TYPE)
+  message(STATUS "hip::amdhip64 is ${amdhip64_type}")
+  if(${amdhip64_type} STREQUAL "STATIC_LIBRARY")
+    # For cyclic dependence
+    target_link_libraries(amdrocclr_static INTERFACE hip::amdhip64)
+  endif()
+
   set_target_properties(hip::device PROPERTIES
     INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
     INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"