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

🍒 [cxx-interop] Disable c++ execution header with libstdcxx versions >= 11 #75971

Merged

Conversation

ADKaster
Copy link
Contributor

Workaround for #75661

Backport form:

Explanation: Removes cyclic dependency from libstdc++ overlay when tbb library is installed on linux
Scope: This change un-breaks linking C++ libraries that are built with C++17, 20, 23 and 26.
Issues: #75661
Original PRs: #75662
Risk: Very low, any projects that were trying to use c++17+ and libstdc++11+ did not build before this change
Testing: Local testing with the test case in the issue, CI testing
Reviewers: @egorzhdan

@ADKaster ADKaster requested a review from a team as a code owner August 19, 2024 23:41
@ADKaster ADKaster changed the title [cxx-interop] Disable c++ execution header with libstdcxx versions >= 11 🍒 [cxx-interop] Disable c++ execution header with libstdcxx versions >= 11 Aug 19, 2024
@ADKaster
Copy link
Contributor Author

Copy link
Contributor

@egorzhdan egorzhdan left a comment

Choose a reason for hiding this comment

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

LGTM!
This is a very reasonable change to land in one of the 6.0.x updates.

@egorzhdan egorzhdan added the c++ interop Feature: Interoperability with C++ label Aug 21, 2024
@egorzhdan
Copy link
Contributor

@swift-ci please test

@egorzhdan egorzhdan merged commit c5b043d into swiftlang:release/6.0 Aug 27, 2024
5 checks passed
@ADKaster ADKaster deleted the backport-libstdcxx-tbb-workaround branch August 27, 2024 15:27
@ADKaster
Copy link
Contributor Author

This is a very reasonable change to land in one of the 6.0.x updates.

@egorzhdan I don't see this change in the release/6.0.2 branch

Should I create another cherry-pick PR, or is this change going to have to wait until 6.1?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c++ interop Feature: Interoperability with C++ swift 6.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants