Skip to content

release/18.x: [libc++][modules] Fixes naming inconsistency. (#83036) #83156

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
Mar 11, 2024

Conversation

llvmbot
Copy link
Member

@llvmbot llvmbot commented Feb 27, 2024

Backport b50bcc7

Requested by: @mordante

@llvmbot llvmbot requested a review from a team as a code owner February 27, 2024 17:16
@llvmbot llvmbot added this to the LLVM 18.X Release milestone Feb 27, 2024
@llvmbot
Copy link
Member Author

llvmbot commented Feb 27, 2024

@ldionne What do you think about merging this PR to the release branch?

@llvmbot llvmbot requested a review from ldionne February 27, 2024 17:16
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Feb 27, 2024
@llvmbot
Copy link
Member Author

llvmbot commented Feb 27, 2024

@llvm/pr-subscribers-libcxx

Author: None (llvmbot)

Changes

Backport b50bcc7

Requested by: @mordante


Full diff: https://github.com/llvm/llvm-project/pull/83156.diff

1 Files Affected:

  • (modified) libcxx/modules/modules.json.in (+1-1)
diff --git a/libcxx/modules/modules.json.in b/libcxx/modules/modules.json.in
index ddc377f28f9194..759ac92d81f18e 100644
--- a/libcxx/modules/modules.json.in
+++ b/libcxx/modules/modules.json.in
@@ -5,7 +5,7 @@
     {
       "logical-name": "std",
       "source-path": "@LIBCXX_MODULE_RELATIVE_PATH@/std.cppm",
-      "is-standard-library": true,
+      "is-std-library": true,
       "local-arguments": {
         "system-include-directories": [
           "@LIBCXX_MODULE_RELATIVE_PATH@"

@mathstuf
Copy link
Contributor

mathstuf commented Mar 8, 2024

This missed 18.1.0 :( .

@mordante
Copy link
Member

mordante commented Mar 8, 2024

I assume it will then be in 18.1.1 in a few weeks.

The modules used is-standard-library and is-std-library. The latter is
the name used in the SG15 proposal,

Fixes: llvm#82879
(cherry picked from commit b50bcc7)
@tstellar tstellar merged commit 439e6f8 into llvm:release/18.x Mar 11, 2024
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
Development

Successfully merging this pull request may close these issues.

5 participants