Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
],
"brew": [
"llvm",
"lld",
"xorriso",
"mtools",
"gdisk",
Expand Down
7 changes: 4 additions & 3 deletions tests/kernel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ 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 ()

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> \
Expand Down
6 changes: 3 additions & 3 deletions toolchain/toolchain_clang.cmake
Original file line number Diff line number Diff line change
@@ -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 ()
Expand Down
Loading