diff --git a/projects/clr/hipamd/bin/hipcc_cmake_linker_helper b/projects/clr/hipamd/bin/hipcc_cmake_linker_helper
new file mode 100755
index 0000000000..bd4f6c118d
--- /dev/null
+++ b/projects/clr/hipamd/bin/hipcc_cmake_linker_helper
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+SOURCE="${BASH_SOURCE[0]}"
+HIP_PATH="$( command cd -P "$( dirname "$SOURCE" )/.." && pwd )"
+HCC_HOME=$1 $HIP_PATH/bin/hipcc "${@:2}"
diff --git a/projects/clr/hipamd/cmake/FindHIP.cmake b/projects/clr/hipamd/cmake/FindHIP.cmake
index ea19725a1e..0001436fee 100644
--- a/projects/clr/hipamd/cmake/FindHIP.cmake
+++ b/projects/clr/hipamd/cmake/FindHIP.cmake
@@ -105,6 +105,25 @@ if(UNIX AND NOT APPLE AND NOT CYGWIN)
     endif()
     mark_as_advanced(HIP_HIPCONFIG_EXECUTABLE)
 
+    # Find HIPCC_CMAKE_LINKER_HELPER executable
+    find_program(
+        HIP_HIPCC_CMAKE_LINKER_HELPER
+        NAMES hipcc_cmake_linker_helper
+        PATHS
+        "${HIP_ROOT_DIR}"
+        ENV ROCM_PATH
+        ENV HIP_PATH
+        /opt/rocm
+        /opt/rocm/hip
+        PATH_SUFFIXES bin
+        NO_DEFAULT_PATH
+        )
+    if(NOT HIP_HIPCC_CMAKE_LINKER_HELPER)
+        # Now search in default paths
+        find_program(HIP_HIPCC_CMAKE_LINKER_HELPER hipcc_cmake_linker_helper)
+    endif()
+    mark_as_advanced(HIP_HIPCC_CMAKE_LINKER_HELPER)
+
     if(HIP_HIPCONFIG_EXECUTABLE AND NOT HIP_VERSION)
         # Compute the version
         execute_process(
@@ -496,7 +515,10 @@ macro(HIP_ADD_EXECUTABLE hip_target)
     HIP_GET_SOURCES_AND_OPTIONS(_sources _cmake_options _hipcc_options _hcc_options _nvcc_options ${ARGN})
     HIP_PREPARE_TARGET_COMMANDS(${hip_target} OBJ _generated_files _source_files ${_sources} HIPCC_OPTIONS ${_hipcc_options} HCC_OPTIONS ${_hcc_options} NVCC_OPTIONS ${_nvcc_options})
     list(REMOVE_ITEM _sources ${_source_files})
-    set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_EXECUTABLE} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET>")
+    if("x${HCC_HOME}" STREQUAL "x")
+        set(HCC_HOME "/opt/rocm/hcc")
+    endif()
+    set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HCC_HOME} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET>")
     add_executable(${hip_target} ${_cmake_options} ${_generated_files} ${_sources})
     set_target_properties(${hip_target} PROPERTIES LINKER_LANGUAGE HIP)
 endmacro()
diff --git a/projects/clr/hipamd/cmake/FindHIP/run_hipcc.cmake b/projects/clr/hipamd/cmake/FindHIP/run_hipcc.cmake
index 6027cb9b0d..4dc2572e98 100644
--- a/projects/clr/hipamd/cmake/FindHIP/run_hipcc.cmake
+++ b/projects/clr/hipamd/cmake/FindHIP/run_hipcc.cmake
@@ -26,6 +26,7 @@ set(HIP_HIPCONFIG_EXECUTABLE "@HIP_HIPCONFIG_EXECUTABLE@") #path
 set(HIP_HOST_COMPILER "@HIP_HOST_COMPILER@") # path
 set(CMAKE_COMMAND "@CMAKE_COMMAND@") # path
 set(HIP_run_make2cmake "@HIP_run_make2cmake@") # path
+set(HCC_HOME "@HCC_HOME@") #path
 
 @HIP_HOST_FLAGS@
 @_HIP_HIPCC_FLAGS@
@@ -42,6 +43,9 @@ execute_process(COMMAND ${HIP_HIPCONFIG_EXECUTABLE} --platform OUTPUT_VARIABLE H
 if(NOT host_flag)
     set(__CC ${HIP_HIPCC_EXECUTABLE})
     if(HIP_PLATFORM STREQUAL "hcc")
+        if(NOT "x${HCC_HOME}" STREQUAL "x")
+            set(ENV{HCC_HOME} ${HCC_HOME})
+        endif()
         set(__CC_FLAGS ${HIP_HIPCC_FLAGS} ${HIP_HCC_FLAGS} ${HIP_HIPCC_FLAGS_${build_configuration}} ${HIP_HCC_FLAGS_${build_configuration}})
     else()
         set(__CC_FLAGS ${HIP_HIPCC_FLAGS} ${HIP_NVCC_FLAGS} ${HIP_HIPCC_FLAGS_${build_configuration}} ${HIP_NVCC_FLAGS_${build_configuration}})