Skip to content

Interop/Cxx: explicitly require C++ for modules #35285

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

Merged
merged 1 commit into from
Jan 7, 2021

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Jan 6, 2021

The C++ interop modules require C++ support. Explicitly require C++ as
a feature when building these modules. This has no impact on the
changes as all the tests enable C++ already.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

@compnerd
Copy link
Member Author

compnerd commented Jan 6, 2021

CC: @hlopko @zoecarver

@compnerd
Copy link
Member Author

compnerd commented Jan 6, 2021

@swift-ci please test

@zoecarver
Copy link
Contributor

We probably want to do this for all C++ test inputs, right?

@compnerd
Copy link
Member Author

compnerd commented Jan 7, 2021

Yeah, I think that is probably a good thing to do. Mind pointing me to the other module definitions?

@zoecarver
Copy link
Contributor

I'm happy to do it. I can put up a patch later tonight.

The paths are test/Interop/Cxx/**/Inputs/module.modulemap.

@zoecarver zoecarver added the c++ interop Feature: Interoperability with C++ label Jan 7, 2021
The C++ interop modules require C++ support.  Explicitly require C++ as
a feature when building these modules.  This has no impact on the
changes as all the tests enable C++ already.
Copy link
Contributor

@zoecarver zoecarver left a comment

Choose a reason for hiding this comment

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

You're the best. Thanks for fixing this.

@swift-ci
Copy link
Contributor

swift-ci commented Jan 7, 2021

Build failed
Swift Test OS X Platform
Git Sha - f02833bd0e8ee2d7e92adf0386bfc2e71b07f08c

@compnerd
Copy link
Member Author

compnerd commented Jan 7, 2021

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Jan 7, 2021

Build failed
Swift Test Linux Platform
Git Sha - df9d1e8

@swift-ci
Copy link
Contributor

swift-ci commented Jan 7, 2021

Build failed
Swift Test OS X Platform
Git Sha - df9d1e8

@compnerd
Copy link
Member Author

compnerd commented Jan 7, 2021

@swift-ci please test Linux platform

@compnerd compnerd merged commit afe9445 into swiftlang:main Jan 7, 2021
@compnerd compnerd deleted the requires branch January 7, 2021 19:33
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++
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants