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

[CMake] Set CMP0157 to OLD when targeting Android with the Windows toolchain #1009

Merged
merged 1 commit into from
Mar 10, 2025

Conversation

weliveindetail
Copy link
Member

@weliveindetail weliveindetail commented Mar 10, 2025

There is no early swift-driver build for the Windows toolchain. As a result, swift-testing fails to build properly when CMP0157 is set to NEW due to object files not being generated.

This sets CMP0157 to OLD when targeting Android with the Windows toolchain until the early swift-driver is available on Windows. This is analog to swiftlang/swift-corelibs-foundation#5180

Checklist:

  • Code and documentation should follow the style of the Style Guide.
  • If public symbols are renamed or modified, DocC references should be updated.

@grynspan grynspan added bug Something isn't working build Affects the project's build configuration or process windows 🪟 Windows support android 🤖 Android support labels Mar 10, 2025
@grynspan grynspan added this to the Swift 6.2 milestone Mar 10, 2025
@grynspan
Copy link
Contributor

@compnerd Would you please help review?

@grynspan
Copy link
Contributor

@swift-ci test

@weliveindetail
Copy link
Member Author

CC: @Steelskin @finagolfin

@Steelskin
Copy link

Not a committer but LGTM

@grynspan
Copy link
Contributor

Waiting for Saleem to sign off, then we can squash and merge.

@finagolfin
Copy link
Member

No need, he didn't comment on the linked Foundation pull either, and this is a tiny pull that his TBC colleagues @weliveindetail and @Steelskin need and won't break anything.

If you're okay with it, @grynspan, please go ahead and merge.

@grynspan
Copy link
Contributor

Alrighty, it's clear the change should only impact Android, so… merging.

@grynspan grynspan merged commit a5dfbc2 into swiftlang:main Mar 10, 2025
3 checks passed
@weliveindetail weliveindetail deleted the windows-cmp0157-workaround branch March 11, 2025 08:48
@weliveindetail
Copy link
Member Author

Thanks for moving on with this so quickly

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
android 🤖 Android support bug Something isn't working build Affects the project's build configuration or process windows 🪟 Windows support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants