Skip to content

Move modulemap to header search directory. NFC intended. #66037

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
May 24, 2023

Conversation

vsapsai
Copy link
Contributor

@vsapsai vsapsai commented May 19, 2023

In code we use #include "swift/Lib/Header.h" which is located in "include/swift/Lib/Header.h", so we use "include/" as a header search path. We should put modulemaps in the same directory and shouldn't rely on clang to search in immediate subdirectories.

rdar://106677321

In code we use `#include "swift/Lib/Header.h"` which is located in
"include/swift/Lib/Header.h", so we use "include/" as a header search
path. We should put modulemaps in the same directory and shouldn't rely
on clang to search in immediate subdirectories.

rdar://106677321
@vsapsai vsapsai requested review from egorzhdan and eeckstein May 19, 2023 23:37
@vsapsai
Copy link
Contributor Author

vsapsai commented May 19, 2023

Relevant LLVM+Clang change is https://reviews.llvm.org/D148776

Copy link
Contributor

@eeckstein eeckstein left a comment

Choose a reason for hiding this comment

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

lgtm

@egorzhdan
Copy link
Contributor

@swift-ci please smoke test

@ributzka ributzka self-requested a review May 23, 2023 21:55
Copy link
Contributor

@ributzka ributzka left a comment

Choose a reason for hiding this comment

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

LGTM

@vsapsai
Copy link
Contributor Author

vsapsai commented May 24, 2023

Thanks for the reviews!

@vsapsai vsapsai merged commit 53aac94 into swiftlang:main May 24, 2023
@vsapsai vsapsai deleted the move-modulemap branch May 24, 2023 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants