Skip to content

Conversation

@cthielen
Copy link
Contributor

This PR cherry picks https://github.com/apple/swift-collections/pull/482/commits, which fixes a typo in the CMake build that is blocking swiftlang/swift#83310.

Checklist

  • I've read the Contribution Guidelines
  • My contributions are licensed under the Swift license.
  • I've followed the coding style of the rest of the project.
  • I've added tests covering all new code paths my change adds to the project (if appropriate).
  • I've added benchmarks covering new functionality (if appropriate).
  • I've verified that my change does not break any existing tests or introduce unexplained benchmark regressions.
  • I've updated the documentation if necessary.

@cthielen cthielen marked this pull request as ready for review July 25, 2025 18:15
@cthielen cthielen requested a review from lorentey as a code owner July 25, 2025 18:15
@cthielen
Copy link
Contributor Author

@swift-ci test

@cthielen
Copy link
Contributor Author

@swift-ci test

@cthielen cthielen force-pushed the cthielen/cherry-pick-cmake-fix branch from 828cb7a to b89859b Compare July 25, 2025 21:40
endif()
endif()

include(PlatformInfo)
Copy link
Member

@etcwilde etcwilde Jul 25, 2025

Choose a reason for hiding this comment

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

It doesn't look like the other patch to add the include(PlatformInfo) landed on this branch so we're not running the PlatformInfo code at all and thus we don't have a swiftmodule triple set. We can drop this commit. (drop 4cf344d from the patch set and you should be good to go)

Misspelled Swift in the Platform info compiler target check.
Fixing that.
@cthielen cthielen force-pushed the cthielen/cherry-pick-cmake-fix branch from b89859b to b33592e Compare July 25, 2025 22:37
@cthielen cthielen merged commit 2d1f417 into apple:release/1.2 Jul 30, 2025
19 checks passed
@cthielen cthielen deleted the cthielen/cherry-pick-cmake-fix branch July 30, 2025 16:34
@lorentey lorentey added this to the 1.2.1 milestone Sep 27, 2025
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.

3 participants