修复actions

This commit is contained in:
2026-04-21 20:44:28 +08:00
parent 5c7d66e3a6
commit a25362d3d4
2 changed files with 13 additions and 2 deletions

View File

@@ -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

View File

@@ -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()