Skip to content

[libcxx] Export directory_iterator in module build #129195

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 3 commits into from
Mar 5, 2025
Merged

Conversation

atetubou
Copy link
Contributor

This is workaround for the link error like https://crbug.com/390537876.

Might be related to #120108 too.

@atetubou atetubou requested a review from a team as a code owner February 28, 2025 05:46
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Feb 28, 2025
@llvmbot
Copy link
Member

llvmbot commented Feb 28, 2025

@llvm/pr-subscribers-libcxx

Author: Takuto Ikuta (atetubou)

Changes

This is workaround for the link error like https://crbug.com/390537876.

Might be related to #120108 too.


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

1 Files Affected:

  • (modified) libcxx/include/module.modulemap (+5-1)
diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap
index 0f2016e7f5d15..f94b6fc519399 100644
--- a/libcxx/include/module.modulemap
+++ b/libcxx/include/module.modulemap
@@ -1229,7 +1229,11 @@ module std [system] {
   module filesystem {
     module copy_options                   { header "__filesystem/copy_options.h" }
     module directory_entry                { header "__filesystem/directory_entry.h" }
-    module directory_iterator             { header "__filesystem/directory_iterator.h" }
+    module directory_iterator             {
+      header "__filesystem/directory_iterator.h"
+      // This is a workaround for https://github.com/llvm/llvm-project/issues/120108.
+      export *
+    }
     module directory_options              { header "__filesystem/directory_options.h" }
     module file_status                    { header "__filesystem/file_status.h" }
     module file_time_type                 { header "__filesystem/file_time_type.h" }

Copy link
Member

@mordante mordante left a comment

Choose a reason for hiding this comment

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

LGTM!

@atetubou
Copy link
Contributor Author

atetubou commented Mar 5, 2025

Thank you for review, can I ask you to merge this?

@mordante mordante merged commit e51331c into llvm:main Mar 5, 2025
85 checks passed
@mordante
Copy link
Member

mordante commented Mar 5, 2025

Thank you for review, can I ask you to merge this?

Thanks for patch! I've just landed it.

@atetubou atetubou deleted the patch-2 branch March 6, 2025 13:51
jph-13 pushed a commit to jph-13/llvm-project that referenced this pull request Mar 21, 2025
This is workaround for the link error like https://crbug.com/390537876.

Might be related to llvm#120108
too.
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