diff --git a/projects/clr/hipamd/hip-config.cmake.in b/projects/clr/hipamd/hip-config.cmake.in
index 914d71be17..31790d3431 100755
--- a/projects/clr/hipamd/hip-config.cmake.in
+++ b/projects/clr/hipamd/hip-config.cmake.in
@@ -187,16 +187,15 @@ if(HIP_COMPILER STREQUAL "clang")
 
   if (NOT compilePropIsSet AND HIP_CXX_COMPILER MATCHES ".*clang\\+\\+")
     set_property(TARGET hip::device APPEND PROPERTY
-      INTERFACE_COMPILE_OPTIONS -mllvm -amdgpu-early-inline-all=true -mllvm -amdgpu-function-calls=false
+      INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-mllvm;-amdgpu-early-inline-all=true;-mllvm;-amdgpu-function-calls=false>"
     )
   endif()
 
   if (NOT compilePropIsSet)
-    if (EXISTS ${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode)
-      set_property(TARGET hip::device APPEND PROPERTY
-        INTERFACE_COMPILE_OPTIONS -xhip
-      )
-    else()
+    set_property(TARGET hip::device APPEND PROPERTY
+      INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:CXX>:SHELL:-x hip>"
+    )
+    if (NOT EXISTS ${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode)
       # This path is to support an older build of the device library
       # TODO: To be removed in the future.
       if(WIN32)
@@ -208,14 +207,14 @@ if(HIP_COMPILER STREQUAL "clang")
         )
       else()
         set_property(TARGET hip::device APPEND PROPERTY
-          INTERFACE_COMPILE_OPTIONS -xhip --hip-device-lib-path=${AMD_DEVICE_LIBS_PREFIX}/lib
+          INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:CXX>:--hip-device-lib-path=${AMD_DEVICE_LIBS_PREFIX}/lib>"
         )
       endif()
     endif()
   endif()
 
   set_property(TARGET hip::device APPEND PROPERTY
-     INTERFACE_LINK_LIBRARIES --hip-link
+     INTERFACE_LINK_LIBRARIES "$<$<LINK_LANGUAGE:CXX>:--hip-link>"
   )
 
   set_property(TARGET hip::device APPEND PROPERTY
@@ -229,11 +228,11 @@ if(HIP_COMPILER STREQUAL "clang")
   foreach(GPU_TARGET ${GPU_TARGETS})
       if (NOT compilePropIsSet)
         set_property(TARGET hip::device APPEND PROPERTY
-          INTERFACE_COMPILE_OPTIONS "--offload-arch=${GPU_TARGET}"
+          INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:CXX>:--offload-arch=${GPU_TARGET}>"
         )
       endif()
       set_property(TARGET hip::device APPEND PROPERTY
-        INTERFACE_LINK_LIBRARIES "--offload-arch=${GPU_TARGET}"
+        INTERFACE_LINK_LIBRARIES "$<$<LINK_LANGUAGE:CXX>:--offload-arch=${GPU_TARGET}>"
       )
   endforeach()
   #Add support for parallel build and link
@@ -244,11 +243,11 @@ if(HIP_COMPILER STREQUAL "clang")
     if(${HIP_CLANG_SUPPORTS_PARALLEL_JOBS} )
       if (NOT compilePropIsSet)
         set_property(TARGET hip::device APPEND PROPERTY
-          INTERFACE_COMPILE_OPTIONS -parallel-jobs=${HIP_CLANG_NUM_PARALLEL_JOBS} -Wno-format-nonliteral
+          INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:CXX>:-parallel-jobs=${HIP_CLANG_NUM_PARALLEL_JOBS};-Wno-format-nonliteral>"
         )
       endif()
       set_property(TARGET hip::device APPEND PROPERTY
-        INTERFACE_LINK_LIBRARIES -parallel-jobs=${HIP_CLANG_NUM_PARALLEL_JOBS}
+        INTERFACE_LINK_LIBRARIES "$<$<LINK_LANGUAGE:CXX>:-parallel-jobs=${HIP_CLANG_NUM_PARALLEL_JOBS}>"
       )
     else()
       message("clang compiler doesn't support parallel jobs")
@@ -257,10 +256,10 @@ if(HIP_COMPILER STREQUAL "clang")
 
   # Add support for __fp16 and _Float16, explicitly link with compiler-rt
   set_property(TARGET hip::host APPEND PROPERTY
-    INTERFACE_LINK_LIBRARIES "-L\"${HIP_CLANG_INCLUDE_PATH}/../lib/linux\" -lclang_rt.builtins-x86_64"
+    INTERFACE_LINK_LIBRARIES "$<$<LINK_LANGUAGE:CXX>:${HIP_CLANG_INCLUDE_PATH}/../lib/linux/libclang_rt.builtins-x86_64.a>"
   )
   set_property(TARGET hip::device APPEND PROPERTY
-    INTERFACE_LINK_LIBRARIES "-L\"${HIP_CLANG_INCLUDE_PATH}/../lib/linux\" -lclang_rt.builtins-x86_64"
+    INTERFACE_LINK_LIBRARIES "$<$<LINK_LANGUAGE:CXX>:${HIP_CLANG_INCLUDE_PATH}/../lib/linux/libclang_rt.builtins-x86_64.a>"
   )
 endif()