diff --git a/projects/hip/hip-config.cmake.in b/projects/hip/hip-config.cmake.in
index 80373ce3b4..1e0193f9fa 100644
--- a/projects/hip/hip-config.cmake.in
+++ b/projects/hip/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"