Skip to content
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.

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

Haiku: Update arcade support #13755

Merged

Conversation

trungnt2910
Copy link
Contributor

  • Fix Haiku toolchain detection code.
  • Register Haiku to XUnit test platforms as mentioned in this comment.

To double check:

@trungnt2910 trungnt2910 force-pushed the dev/trungnt2910/haiku-toolchain branch from 10106c9 to af775fd Compare June 2, 2023 15:46
@trungnt2910 trungnt2910 force-pushed the dev/trungnt2910/haiku-toolchain branch 4 times, most recently from 7e4ec38 to 7b784d7 Compare June 9, 2023 07:12
@trungnt2910 trungnt2910 force-pushed the dev/trungnt2910/haiku-toolchain branch 2 times, most recently from 0b315b6 to 1d0176a Compare June 19, 2023 02:53
@trungnt2910 trungnt2910 force-pushed the dev/trungnt2910/haiku-toolchain branch 2 times, most recently from 62a9525 to d752f5e Compare July 4, 2023 02:18
@trungnt2910 trungnt2910 force-pushed the dev/trungnt2910/haiku-toolchain branch from d752f5e to b0a6ea7 Compare July 14, 2023 12:37
@trungnt2910 trungnt2910 force-pushed the dev/trungnt2910/haiku-toolchain branch from b0a6ea7 to 480f2d9 Compare July 22, 2023 10:08
@trungnt2910 trungnt2910 force-pushed the dev/trungnt2910/haiku-toolchain branch from 480f2d9 to 1d6ce99 Compare July 30, 2023 06:44
@trungnt2910 trungnt2910 force-pushed the dev/trungnt2910/haiku-toolchain branch from 1d6ce99 to 4df669b Compare August 16, 2023 05:48
- Fix Haiku toolchain detection code.
- Register Haiku to XUnit test platforms.
@trungnt2910 trungnt2910 force-pushed the dev/trungnt2910/haiku-toolchain branch from 4df669b to 6d1d15d Compare August 20, 2023 11:42
Copy link
Member

@am11 am11 left a comment

Choose a reason for hiding this comment

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

Sorry this fell off my radar. LGTM!

cc @ViktorHofer

@@ -207,6 +207,7 @@ elseif(ILLUMOS)
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
elseif(HAIKU)
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")

set(TOOLSET_PREFIX ${TOOLCHAIN}-)
function(locate_toolchain_exec exec var)
Copy link
Member

Choose a reason for hiding this comment

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

We could hoist this function out of this if-else block and reuse it for both Haiku and illumos. (perhaps as a separate PR)

@ViktorHofer ViktorHofer merged commit 16ad6f6 into dotnet:main Aug 31, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants