Skip to content

[libc++][C++20 modules] Fixes CMake include paths. #65079

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
Sep 4, 2023

Conversation

mordante
Copy link
Member

When the modules are used in a bootstrap build the paths ${LIBCXX_GENERATED_INCLUDE_DIR} and ${LIBCXX_GENERATED_INCLUDE_TARGET_DIR} have a different value and both are needed to build modules.

This issue has been reported on Slack.

@mordante mordante requested a review from ldionne August 29, 2023 17:41
@philnik777 philnik777 added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Aug 30, 2023
@ldionne ldionne self-requested a review August 31, 2023 13:25
@ldionne
Copy link
Member

ldionne commented Aug 31, 2023

LGTM but can you please poke the CI again to get a green run?

@ldionne
Copy link
Member

ldionne commented Aug 31, 2023

I think the workflow we want is that you rebase your patch on top of main and push --force here to avoid creating multiple commits?

@mordante mordante force-pushed the module_include_paths branch from f1e9c74 to 4aacb5b Compare August 31, 2023 19:37
@mordante
Copy link
Member Author

I think the workflow we want is that you rebase your patch on top of main and push --force here to avoid creating multiple commits?

That indeed does the trick. FYI the existing libc++ buildkite CI job got, as wanted, cancelled.

When the modules are used in a bootstrap build the paths
${LIBCXX_GENERATED_INCLUDE_DIR} and ${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}
have a different value and both are needed to build modules.

This issue has been reported on Slack.
@mordante mordante force-pushed the module_include_paths branch from 4aacb5b to c7dead0 Compare September 4, 2023 15:34
@mordante mordante requested a review from a team as a code owner September 4, 2023 15:34
@mordante mordante merged commit 10343c9 into llvm:main Sep 4, 2023
@mordante mordante deleted the module_include_paths branch September 4, 2023 18:35
avillega pushed a commit to avillega/llvm-project that referenced this pull request Sep 11, 2023
When the modules are used in a bootstrap build the paths
${LIBCXX_GENERATED_INCLUDE_DIR} and
${LIBCXX_GENERATED_INCLUDE_TARGET_DIR} have a different value and both
are needed to build modules.

This issue has been reported on Slack.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants