From 877b1b7dfb0ce077e50127cced9d196002fb7ff7 Mon Sep 17 00:00:00 2001 From: ROllerozxa Date: Sat, 3 May 2025 16:36:01 +0200 Subject: [PATCH] Fix Haiku CI to build with Haiku subsystems enabled --- .github/workflows/create-test-plan.py | 9 ++------- build-scripts/cmake-toolchain-haiku-x86_64.cmake | 11 +++++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 build-scripts/cmake-toolchain-haiku-x86_64.cmake diff --git a/.github/workflows/create-test-plan.py b/.github/workflows/create-test-plan.py index 8048e2bc32..e4662981a1 100755 --- a/.github/workflows/create-test-plan.py +++ b/.github/workflows/create-test-plan.py @@ -638,14 +638,9 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta fpic = False job.run_tests = False job.apt_packages.append("ccache") - job.cc = "x86_64-unknown-haiku-gcc" - job.cxx = "x86_64-unknown-haiku-g++" + job.test_pkg_config = False + job.cmake_toolchain_file = "/__w/SDL/SDL/build-scripts/cmake-toolchain-haiku-x86_64.cmake" job.sudo = "" - job.cmake_arguments.extend(( - f"-DCMAKE_C_COMPILER={job.cc}", - f"-DCMAKE_CXX_COMPILER={job.cxx}", - "-DSDL_UNIX_CONSOLE_BUILD=ON", - )) job.shared_lib = SharedLibType.SO_0 job.static_lib = StaticLibType.A case SdlPlatform.PowerPC64 | SdlPlatform.PowerPC: diff --git a/build-scripts/cmake-toolchain-haiku-x86_64.cmake b/build-scripts/cmake-toolchain-haiku-x86_64.cmake new file mode 100644 index 0000000000..3d4cc27be9 --- /dev/null +++ b/build-scripts/cmake-toolchain-haiku-x86_64.cmake @@ -0,0 +1,11 @@ +set(CMAKE_SYSTEM_NAME Haiku) +set(CMAKE_SYSTEM_PROCESSOR x86_64) + +set(CMAKE_C_COMPILER x86_64-unknown-haiku-gcc) +set(CMAKE_CXX_COMPILER x86_64-unknown-haiku-g++) + +set(CMAKE_FIND_ROOT_PATH /tools/cross-tools-x86_64) + +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)