Skip to content

ClangImporter: correct a duplicated path component #67718

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
Aug 5, 2023

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Aug 3, 2023

When computing the path for a non-architecture specific resource, we would append the architecture unconditionally if -sdk is used. This would result in the path being miscomputed with the architecture or the architecture duplicated if it was architecture specific.

Found by inspection.

When computing the path for a non-architecture specific resource, we
would append the architecture unconditionally if `-sdk` is used.  This
would result in the path being miscomputed with the architecture or the
architecture duplicated if it was architecture specific.

Found by inspection.
@compnerd
Copy link
Member Author

compnerd commented Aug 3, 2023

@swift-ci please test

@hyp
Copy link
Contributor

hyp commented Aug 3, 2023

should hopefully fix #67715

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.

Thanks! 🙈

@compnerd
Copy link
Member Author

compnerd commented Aug 3, 2023

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

compnerd commented Aug 3, 2023

@swift-ci please test macOS platform

@compnerd compnerd linked an issue Aug 3, 2023 that may be closed by this pull request
@compnerd compnerd added the c++ interop Feature: Interoperability with C++ label Aug 3, 2023
@compnerd
Copy link
Member Author

compnerd commented Aug 4, 2023

@swift-ci please smoke test macOS platform

@compnerd
Copy link
Member Author

compnerd commented Aug 4, 2023

@swift-ci please test macOS platform

1 similar comment
@compnerd
Copy link
Member Author

compnerd commented Aug 4, 2023

@swift-ci please test macOS platform

@compnerd
Copy link
Member Author

compnerd commented Aug 4, 2023

Please test with following PRs:
#67738

@swift-ci please test macOS platform

@compnerd
Copy link
Member Author

compnerd commented Aug 4, 2023

@swift-ci please smoke test macOS platform

@compnerd compnerd merged commit a4c5b9d into swiftlang:main Aug 5, 2023
@compnerd compnerd deleted the architectures-for-none branch August 5, 2023 00:31
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.

CxxShim cannot be imported on Windows
3 participants