Skip to content

Some Yokai improvements for macOS #1984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illwieckz wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −12
Open

Some Yokai improvements for macOS #1984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b0f8ab
yokai: use awk when sed is not good enough on macOS (detect shell scr…
illwieckz Jun 21, 2026
78d2d62
yokai: rewrite some system detection to avoid warnings on macOS (look…
illwieckz Jun 21, 2026
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 cmake/Yokai/Detection/detect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ do
| sed -e 's/YOKAI_COMPILER/YOKAI_C_COMPILER/' \
| sed -e 's/YOKAI_SYSTEM/YOKAI_TARGET_SYSTEM/' \
| sed -e 's/YOKAI_ARCH/YOKAI_TARGET_ARCH/' \
| sed -E 's/^([^=]+)=/\U\1=/' \
| awk -F= '{print toupper($1) "=" $2}' \
|| "${@}" "${file_path}" -o "${temp_file}"

rm "${temp_file}"
Expand Down
20 changes: 9 additions & 11 deletions cmake/Yokai/System.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,6 @@ function(yokai_detect_host_system)
endif()
endforeach()

if (system_name STREQUAL "Unknown")
message(WARNING "Host system detection failed, may misdetect the target as the host.")

if (WIN32)
set(system_name "Windows")
elseif (APPLE)
set(system_name "macOS")
endif()
endif()

if (system_name STREQUAL "Unknown")
set(SYSTEM_Darwin "macOS")
set(SYSTEM_MSYS "Windows")
Expand All @@ -59,8 +49,16 @@ function(yokai_detect_host_system)
set(system_name "${SYSTEM_${name}}")
endif()
endforeach()
endif()

detect_cmake_host_system("system_name")
if (system_name STREQUAL "Unknown")
message(WARNING "Host system detection failed, may misdetect the target as the host.")

if (WIN32)
set(system_name "Windows")
elseif (APPLE)
set(system_name "macOS")
endif()
endif()

set(YOKAI_HOST_SYSTEM_NAME "${system_name}" PARENT_SCOPE)
Expand Down
Loading