Patch back from rocm-systems

Author: ammallya

CONTRIBUTING.md

@@ -5,7 +5,8 @@ If you want to contribute to our documentation, refer to {doc}`Contribute to ROC
 
 ## Issue Discussion ##
 
-Please use the [GitHub Issue](https://github.com/ROCm/HIP/issues) tab to notify us of issues.
+Please use the [rocm-systems Issues](https://github.com/ROCm/rocm-systems/issues) tab to notify us of issues. In the `rocm-systems` repo, issues
+related to HIP should be labeled accordingly to ensure they receive the proper attention.
 
 * Use your best judgement for issue creation. If your issue is already listed, upvote the issue and
   comment or post to provide additional details, such as how you reproduced this issue.

cmake/FindHIP.cmake

@@ -304,9 +304,17 @@ elseif("${HIP_COMPILER}" STREQUAL "clang")
     endif()
 
     # Set the CMake Flags to use the HIP-Clang Compiler.
-    set(CMAKE_HIP_CREATE_SHARED_LIBRARY "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-    set(CMAKE_HIP_CREATE_SHARED_MODULE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <LINK_LIBRARIES> -shared" )
-    set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+    if(WIN32)
+        # On Windows, use CMake's -E env to set HIP_CLANG_PATH instead of a wrapper script
+        set(CMAKE_HIP_CREATE_SHARED_LIBRARY "\"${CMAKE_COMMAND}\" -E env HIP_CLANG_PATH=${HIP_CLANG_PATH} \"${HIP_HIPCC_EXECUTABLE}\" ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+        set(CMAKE_HIP_CREATE_SHARED_MODULE "\"${CMAKE_COMMAND}\" -E env HIP_CLANG_PATH=${HIP_CLANG_PATH} \"${HIP_HIPCC_EXECUTABLE}\" ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <LINK_LIBRARIES> -shared" )
+        set(CMAKE_HIP_LINK_EXECUTABLE "\"${CMAKE_COMMAND}\" -E env HIP_CLANG_PATH=${HIP_CLANG_PATH} \"${HIP_HIPCC_EXECUTABLE}\" ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+    else()
+        # On Linux, use the hipcc_cmake_linker_helper script
+        set(CMAKE_HIP_CREATE_SHARED_LIBRARY "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+        set(CMAKE_HIP_CREATE_SHARED_MODULE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <LINK_LIBRARIES> -shared" )
+        set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+    endif()
 
     if("${HIP_RUNTIME}" STREQUAL "rocclr")
       if(TARGET host)
@@ -708,7 +716,13 @@ macro(HIP_ADD_EXECUTABLE hip_target)
           endif() # HIP_CLANG_INSTALL_DIR Check
         endif()
 
-        set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+        if(WIN32)
+            # On Windows, use CMake's -E env to set HIP_CLANG_PATH instead of a wrapper script
+            set(CMAKE_HIP_LINK_EXECUTABLE "\"${CMAKE_COMMAND}\" -E env HIP_CLANG_PATH=${HIP_CLANG_PATH} \"${HIP_HIPCC_EXECUTABLE}\" ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+        else()
+            # On Linux, use the hipcc_cmake_linker_helper script
+            set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+        endif()
     else()
         set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
     endif()