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

build: enable control over the C++ interop modules #65398

Merged
merged 1 commit into from
Apr 28, 2023

Conversation

compnerd
Copy link
Member

Treat the C++ interop modules similar to the Concurrency and StringProcessing modules, enabled through a top-level global flag. The flag now enables disabling the C++ interop modules when the standard library is built.

Based on the original work by Egor Zhdan!

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please build toolchain windows platform

@zoecarver
Copy link
Contributor

Thanks, Saleem! This looks great.

@zoecarver zoecarver requested a review from edymtt April 24, 2023 20:19
CMakeLists.txt Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please test

Copy link
Contributor

@edymtt edymtt left a comment

Choose a reason for hiding this comment

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

The change looks good to me -- I'm doing some additional testing to make sure this works in other build setups.

Treat the C++ interop modules similar to the Concurrency and
StringProcessing modules, enabled through a top-level global flag.  The
flag now enables disabling the C++ interop modules when the standard
library is built.

Based on the original work by Egor Zhdan!
@compnerd
Copy link
Member Author

@swift-ci please test

Copy link
Contributor

@edymtt edymtt left a comment

Choose a reason for hiding this comment

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

I confirm there are no regression in the additional testing I did, so this can be merged at your convenience.

@compnerd could you please cherry-pick this to release/5.9 as well?

@compnerd compnerd merged commit 9829723 into swiftlang:main Apr 28, 2023
@compnerd compnerd deleted the interop-control branch April 28, 2023 17:35
egorzhdan added a commit that referenced this pull request May 2, 2023
…EROP=NO`

This fixes the Swift LSAN CI job Linux (https://ci.swift.org/job/oss-swift-RA-lsan-linux-ubuntu-18_04/) that started failing after #65398.

rdar://108674065
egorzhdan added a commit that referenced this pull request May 14, 2023
…EROP=NO`

This fixes the Swift LSAN CI job Linux (https://ci.swift.org/job/oss-swift-RA-lsan-linux-ubuntu-18_04/) that started failing after #65398.

rdar://108674065
(cherry picked from commit b586604)
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