Skip to content

Add ability to use clang with GNU toolchain on Haiku #16756

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

Merged
jkoritzinsky merged 2 commits into from
Apr 25, 2026
+9 −3
Merged

Add ability to use clang with GNU toolchain on Haiku #16756

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78bfd88
Add ability to use clang with GNU toolchain on Haiku
am11 Apr 24, 2026
2f431e7
Keep gcc working
am11 Apr 25, 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
12 changes: 9 additions & 3 deletions eng/common/cross/toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,19 @@ elseif(ILLUMOS)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
Copy link
Copy Markdown
Contributor

@trungnt2910 trungnt2910 Apr 24, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will CMake still be able to correctly search for the GCC cross-compilers after this for pure-GNU builds (with the -gcc flag)?

Copy link
Copy Markdown
Member Author

@am11 am11 Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We normally only support either clang or gcc with --cross. clang is usually preferred; one reason is llvm-toolchains are multi-targeting (clang and lld can produce any binary on any host platform, including windows) while GNU toolchain is built in a target specific manner.

I have added the check to make -gcc work though. I recommend you switch to clang and mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net11.0-cross-haiku-amd64 as well for builds to keep things tight and in check (unless there is a problem / meaningful-difference with binaries produced by either toolchain).

Copy link
Copy Markdown
Contributor

@trungnt2910 trungnt2910 Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, if that's the case (and if you have already gotten a full clang-based build working) then I'm fine with dropping GCC.

If there are any further bugs it's better to upstream patches to llvm-project instead.

set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

locate_toolchain_exec(gcc CMAKE_C_COMPILER)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
if ($ENV{CCC_CC} MATCHES ".*gcc.*")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
locate_toolchain_exec(gcc CMAKE_C_COMPILER)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
else()
set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
endif()

# let CMake set up the correct search paths
include(Platform/Haiku)
Expand Down
Loading