Skip to content

[cxx-interop] Make CxxShim header and modulemap arch-independent #66765

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
Jun 21, 2023

Conversation

egorzhdan
Copy link
Contributor

This moves libcxxshim.modulemap, libcxxshim.h and libcxxstdlibshim.h from *.xctoolchain/usr/lib/swift/macosx/arm64e to *.xctoolchain/usr/lib/swift/macosx to simplify distribution.

rdar://110788977

This moves `libcxxshim.modulemap`, `libcxxshim.h` and `libcxxstdlibshim.h` from `*.xctoolchain/usr/lib/swift/macosx/arm64e` to `*.xctoolchain/usr/lib/swift/macosx` to simplify distribution.

rdar://110788977
@egorzhdan egorzhdan added the c++ interop Feature: Interoperability with C++ label Jun 20, 2023
@egorzhdan egorzhdan requested review from zoecarver and hyp as code owners June 20, 2023 14:58
@egorzhdan
Copy link
Contributor Author

@swift-ci please smoke test

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.

LGTM. I don't know too much about this code, though. I think you're the code owner for this part of the compiler :)

@egorzhdan egorzhdan merged commit fbf15ae into main Jun 21, 2023
@egorzhdan egorzhdan deleted the egorzhdan/arch-independent-cxxshim branch June 21, 2023 13:29
egorzhdan added a commit to swiftlang/swift-installer-scripts that referenced this pull request Jun 22, 2023
This adjusts the Windows installation logic after the changes in swiftlang/swift#66765

rdar://110788977
egorzhdan added a commit to swiftlang/swift-installer-scripts that referenced this pull request Jun 22, 2023
This adjusts the Windows installation logic after the changes in swiftlang/swift#66765

rdar://110788977
compnerd pushed a commit to swiftlang/swift-installer-scripts that referenced this pull request Jun 22, 2023
This adjusts the Windows installation logic after the changes in swiftlang/swift#66765

rdar://110788977
compnerd added a commit to compnerd/swift-installer-scripts that referenced this pull request Jul 27, 2023
This adjusts the Windows installation logic after the changes in swiftlang/swift#66765

rdar://110788977
compnerd added a commit to compnerd/swift-installer-scripts that referenced this pull request Jul 27, 2023
This adjusts the Windows installation logic after the changes in swiftlang/swift#66765

rdar://110788977

Fixes: swiftlang/swift#67462
compnerd added a commit to swiftlang/swift-installer-scripts that referenced this pull request Jul 27, 2023
This adjusts the Windows installation logic after the changes in swiftlang/swift#66765

rdar://110788977

Fixes: swiftlang/swift#67462
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.

2 participants