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.

Sign up for GitHub

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

Jump to bottom

[cxx-interop] Do not pass the C++ standard if C++ interop is not enabled #7188

Merged
merged 1 commit into from
Dec 12, 2023
Merged

[cxx-interop] Do not pass the C++ standard if C++ interop is not enabled #7188

merged 1 commit into from
Dec 12, 2023

Conversation

egorzhdan
Copy link
Contributor

This fixes the Swift PR testing failures.

Motivation:

If C++ interop is not enabled, SwiftPM should not pass -Xcc -std=c++17 flags.

Result:

Only pass these flags if C++ interop is enabled.

@egorzhdan
Copy link
Contributor Author

@swift-ci please test

@mikeash mikeash merged commit 351222f into main Dec 12, 2023
@mikeash mikeash deleted the egorzhdan/cpp-std-fix branch December 12, 2023 15:28
@hassila hassila mentioned this pull request Dec 12, 2023
Closed
egorzhdan added a commit that referenced this pull request Dec 12, 2023
@egorzhdan
[cxx-interop] Do not pass the C++ standard if C++ interop is not enab…
4479636 
…led (#7188)

This fixes the Swift PR testing failures.

### Motivation:

If C++ interop is not enabled, SwiftPM should not pass `-Xcc -std=c++17`
flags.

### Result:

Only pass these flags if C++ interop is enabled.

(cherry picked from commit 351222f)
@egorzhdan egorzhdan mentioned this pull request Dec 12, 2023
Merged
mikeash pushed a commit that referenced this pull request Dec 12, 2023
@egorzhdan
🍒[cxx-interop] Do not pass the C++ standard if C++ interop is not ena…
0c5312b 
…bled (#7194)

This fixes the Swift PR testing failures.

### Motivation:

If C++ interop is not enabled, SwiftPM should not pass `-Xcc -std=c++17`
flags.

### Result:

Only pass these flags if C++ interop is enabled.

Original PR: #7188

(cherry picked from commit 351222f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MaxDesiatov MaxDesiatov MaxDesiatov approved these changes

@neonichu neonichu Awaiting requested review from neonichu

@tomerd tomerd Awaiting requested review from tomerd

Assignees
No one assigned
Labels
bug C++ interop
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@egorzhdan @MaxDesiatov @mikeash