From 9fc1ed18ac3fab523a98bb32e369d7dc3b11dd6a Mon Sep 17 00:00:00 2001
From: Olivier Chafik <ochafik@google.com>
Date: Fri, 31 Jan 2025 18:23:08 +0000
Subject: [PATCH] set CMAKE_HIP_COMPILER_LAUNCHER env var, not cmake var

---
 .github/workflows/build.yml | 2 ++
 ggml/src/CMakeLists.txt     | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 022b9bd03..e431f3052 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1186,6 +1186,7 @@ jobs:
         run: |
           $env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
           $env:CMAKE_PREFIX_PATH="${env:HIP_PATH}"
+          $env:CMAKE_HIP_COMPILER_LAUNCHER=sccache
           cmake -G "Unix Makefiles" -B build -S . `
             -DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
             -DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
@@ -1236,6 +1237,7 @@ jobs:
         run: |
           $env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
           $env:CMAKE_PREFIX_PATH="${env:HIP_PATH}"
+          $env:CMAKE_HIP_COMPILER_LAUNCHER=sccache
           cmake -G "Unix Makefiles" -B build -S . `
             -DCMAKE_C_COMPILER="${env:HIP_PATH}\bin\clang.exe" `
             -DCMAKE_CXX_COMPILER="${env:HIP_PATH}\bin\clang++.exe" `
diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
index 8d9056af7..0002ac18a 100644
--- a/ggml/src/CMakeLists.txt
+++ b/ggml/src/CMakeLists.txt
@@ -100,10 +100,6 @@ if (GGML_CCACHE)
             set(GGML_CCACHE_VARIANT ccache)
         else()
             set(GGML_CCACHE_VARIANT sccache)
-            if(GGML_HIP)
-                # TODO: should not be set globally
-                set(GLOBAL CMAKE_HIP_COMPILER_LAUNCHER sccache)
-            endif()
         endif()
         # TODO: should not be set globally
         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${GGML_CCACHE_VARIANT}")