Skip to content

macOS smoketest: enable Distributed and Synchronization in runtimes #83604

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented Aug 7, 2025

To make this work:

  • expose SwiftCMakeConfig.h from the Core build system, to support scenarios in which the downstream Distributed build is leveraging the config files generated by CMake itself.
  • adjust how SwiftShims is defined in FindSwiftCore.cmake, so that the shims are found from C++ and that we don't get redefinition errors when multiple module maps are in the search paths.

Fixes #83449
Addresses rdar://149241603, rdar://157165530

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

This definitely is heading in the right direction I think.

@edymtt edymtt force-pushed the edymtt/build-distributed-synchronization-in-new-runtimes-build branch from 61c1ef4 to 9cf94b2 Compare August 8, 2025 17:20
@edymtt edymtt requested a review from compnerd August 8, 2025 17:21
@edymtt
Copy link
Contributor Author

edymtt commented Aug 8, 2025

@swift-ci please smoke test

@edymtt
Copy link
Contributor Author

edymtt commented Aug 8, 2025

@swift-ci please build toolchain Windows

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

The minor fix for the Windows and Darwin build and comment are the big things left I think. This is pretty close to ready!

@edymtt edymtt force-pushed the edymtt/build-distributed-synchronization-in-new-runtimes-build branch from 9cf94b2 to 242cf74 Compare August 8, 2025 18:57
@edymtt edymtt requested a review from compnerd August 8, 2025 18:59
@edymtt
Copy link
Contributor Author

edymtt commented Aug 8, 2025

@swift-ci please smoke test

@edymtt
Copy link
Contributor Author

edymtt commented Aug 8, 2025

@swift-ci please build toolchain Windows

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Nice, this now makes sense to me. I think that this is going to clean up some of the windows build rules - we can install the content and we simply don't package up the header in the distribution.

To make this work:
* expose SwiftCMakeConfig.h from the Core build
system, to support scenarios in which the downstream Distributed build
is leveraging the config files generated by CMake itself.
* adjust how SwiftShims is defined in `FindSwiftCore.cmake`, so that the
shims are found from C++ and that we don't get redefinition errors
when multiple module maps are in the search paths.

Fixes swiftlang#83449
Addresses rdar://149241603, rdar://157165530
@edymtt edymtt force-pushed the edymtt/build-distributed-synchronization-in-new-runtimes-build branch from 242cf74 to 48fd452 Compare August 8, 2025 20:18
@edymtt
Copy link
Contributor Author

edymtt commented Aug 8, 2025

@swift-ci please smoke test

@edymtt
Copy link
Contributor Author

edymtt commented Aug 8, 2025

@swift-ci please build toolchain Windows

@edymtt
Copy link
Contributor Author

edymtt commented Aug 8, 2025

@swift-ci please smoke test macOS

@edymtt
Copy link
Contributor Author

edymtt commented Aug 11, 2025

@swift-ci please smoke test Windows

@edymtt edymtt enabled auto-merge August 11, 2025 13:56
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.

Handle the cross-repository dependency for SwiftCMakeConfig.h
2 participants