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: 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 834ed9e..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 () @@ -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} \ 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 ()