From 591e50499a42d461b72c51e451374c39de3a6bdc Mon Sep 17 00:00:00 2001
From: Daniil Tatianin <34326714+d-tatianin@users.noreply.github.com>
Date: Wed, 12 Mar 2025 20:18:03 +0300
Subject: [PATCH 1/3] ci: switch to latest cache

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 68b52fa..e63ee09 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,7 +38,7 @@ jobs:
 
       - if: ${{ matrix.toolchain == 'gcc' }}
         name: Restore cache
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v4.2.2
         env:
           gcc-version: 13.2.0
         with:

From 8271e02445f54d567d4268bdc1d02de5db7f97c3 Mon Sep 17 00:00:00 2001
From: d-tatianin <99danilt@gmail.com>
Date: Wed, 12 Mar 2025 12:19:40 -0700
Subject: [PATCH 2/3] tests/kernel: disable linker dependency tracking

Signed-off-by: Daniil Tatianin  <99danilt@gmail.com>
---
 tests/kernel/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/kernel/CMakeLists.txt b/tests/kernel/CMakeLists.txt
index 834ed9e..d14c12b 100644
--- a/tests/kernel/CMakeLists.txt
+++ b/tests/kernel/CMakeLists.txt
@@ -16,6 +16,7 @@ endif ()
 set(CMAKE_C_COMPILER "clang")
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSROOT "")
+set(CMAKE_LINK_DEPENDS_USE_LINKER FALSE)
 set(
     CMAKE_C_LINK_EXECUTABLE
     "${LLD_LINKER} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> \

From 857f388dc2a5edf9dd21cf6ed40e218c399dbac5 Mon Sep 17 00:00:00 2001
From: d-tatianin <99danilt@gmail.com>
Date: Wed, 12 Mar 2025 12:27:31 -0700
Subject: [PATCH 3/3] build: install lld as a separate package

Apparently brew now ships this as a separate package.

Signed-off-by: Daniil Tatianin <99danilt@gmail.com>
---
 build.py                        | 1 +
 tests/kernel/CMakeLists.txt     | 6 +++---
 toolchain/toolchain_clang.cmake | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.py b/build.py
index cf84f4b..075931e 100755
--- a/build.py
+++ b/build.py
@@ -47,6 +47,7 @@
     ],
     "brew": [
         "llvm",
+        "lld",
         "xorriso",
         "mtools",
         "gdisk",
diff --git a/tests/kernel/CMakeLists.txt b/tests/kernel/CMakeLists.txt
index d14c12b..7020404 100644
--- a/tests/kernel/CMakeLists.txt
+++ b/tests/kernel/CMakeLists.txt
@@ -3,12 +3,12 @@ cmake_minimum_required(VERSION 3.16)
 if (APPLE)
     execute_process(
         COMMAND
-        brew --prefix llvm
+        brew --prefix lld
         OUTPUT_VARIABLE
-        BREW_LLVM_PREFIX
+        BREW_LLD_PREFIX
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    set(LLD_LINKER "${BREW_LLVM_PREFIX}/bin/ld.lld")
+    set(LLD_LINKER "${BREW_LLD_PREFIX}/bin/ld.lld")
 else ()
     set(LLD_LINKER "ld.lld")
 endif ()
diff --git a/toolchain/toolchain_clang.cmake b/toolchain/toolchain_clang.cmake
index 776feae..5d56ba5 100644
--- a/toolchain/toolchain_clang.cmake
+++ b/toolchain/toolchain_clang.cmake
@@ -1,12 +1,12 @@
 if (APPLE)
     execute_process(
         COMMAND
-        brew --prefix llvm
+        brew --prefix lld
         OUTPUT_VARIABLE
-        BREW_LLVM_PREFIX
+        BREW_LLD_PREFIX
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    set(LLD_LINKER "${BREW_LLVM_PREFIX}/bin/lld")
+    set(LLD_LINKER "${BREW_LLD_PREFIX}/bin/ld.lld")
 else ()
     set(LLD_LINKER "lld")
 endif ()