diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbd9ceedc..d7ffec4c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -257,7 +257,6 @@ build:windows:
       -D BUILD_$BUILD_TARGET=ON 
       -D GPU_TARGETS=$GPU_TARGET
       -D CMAKE_CXX_COMPILER:PATH="${env:HIP_PATH}\bin\clang++.exe" 
-      -D CMAKE_C_COMPILER:PATH="${env:HIP_PATH}\bin\clang.exe" 
       -D CMAKE_PREFIX_PATH:PATH="${env:HIP_PATH}" 
       -D CMAKE_BUILD_TYPE="$BUILD_TYPE" 
     - cmake --build "$CI_PROJECT_DIR/build" 
diff --git a/toolchain-linux.cmake b/toolchain-linux.cmake
index 6a8b6d082..6a71c2aac 100644
--- a/toolchain-linux.cmake
+++ b/toolchain-linux.cmake
@@ -15,13 +15,3 @@ if (NOT DEFINED ENV{CXX})
 else()
   set(CMAKE_CXX_COMPILER "$ENV{CXX}" CACHE PATH "Path to the C++ compiler")
 endif()
-
-if (NOT DEFINED ENV{CC})
-  set(CMAKE_C_COMPILER "${rocm_bin}/amdclang" CACHE PATH "Path to the C compiler")
-  set(CMAKE_C_FLAGS_INIT "-mllvm -amdgpu-early-inline-all=true -mllvm -amdgpu-function-calls=false")
-  if (DEFINED ENV{HIPCC_COMPILE_FLAGS_APPEND})
-    set(CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS_INIT} $ENV{HIPCC_COMPILE_FLAGS_APPEND}")
-  endif()
-else()
-  set(CMAKE_C_COMPILER "$ENV{CC}" CACHE PATH "Path to the C compiler")
-endif()
diff --git a/toolchain-windows.cmake b/toolchain-windows.cmake
index a14eae680..fe1cae6b5 100644
--- a/toolchain-windows.cmake
+++ b/toolchain-windows.cmake
@@ -15,7 +15,6 @@ else()
 endif()
 
 set(CMAKE_CXX_COMPILER "${rocm_bin}/clang++.exe")
-set(CMAKE_C_COMPILER "${rocm_bin}/clang.exe")
 
 if (NOT python)
   set(python "python3") # take default for windows