From a25362d3d4bf526f0c9b1a5ac3c78a4295fc97d8 Mon Sep 17 00:00:00 2001
From: Leonmmcoset <testmod@qq.com>
Date: Tue, 21 Apr 2026 20:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dactions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-os.yml | 7 +++++++
 CMakeLists.txt                 | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-os.yml b/.github/workflows/build-os.yml
index 3d4b267..c122aad 100644
--- a/.github/workflows/build-os.yml
+++ b/.github/workflows/build-os.yml
@@ -74,6 +74,13 @@ jobs:
           cmake -S . -B build-cmake \
             -DCMAKE_BUILD_TYPE=Release \
             -DNO_COLOR=1 \
+            -DCC=gcc \
+            -DKERNEL_CXX=g++ \
+            -DLD=ld.lld \
+            -DUSER_CC=cc \
+            -DUSER_LD=ld.lld \
+            -DNM=llvm-nm \
+            -DADDR2LINE=llvm-addr2line \
             -DLIMINE_REPO=https://github.com/limine-bootloader/limine.git
 
       - name: Build ISO
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1abf84..6ae5e08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,16 +56,20 @@ function(resolve_tool_with_fallback VAR_NAME)
         endif()
         set(_resolved "${_requested}")
     else()
+        unset(_requested_path CACHE)
+        unset(_requested_path)
         find_program(_requested_path NAMES "${_requested}")
         if(_requested_path)
-            set(_resolved "${_requested}")
+            set(_resolved "${_requested_path}")
         else()
             set(_resolved "")
             foreach(_cand IN LISTS _fallbacks)
+                unset(_cand_path CACHE)
+                unset(_cand_path)
                 find_program(_cand_path NAMES "${_cand}")
                 if(_cand_path)
                     cl_log_warn("${VAR_NAME} '${_requested}' not found; fallback to '${_cand}'")
-                    set(_resolved "${_cand}")
+                    set(_resolved "${_cand_path}")
                     break()
                 endif()
             endforeach()