Skip to content

Conversation

@artemcm
Copy link
Contributor

@artemcm artemcm commented May 22, 2025

On creation, ClangImporter adds overlay modulemap files for non-modular platform libraries (e.g. glibc, libstdc++), which allows Swift code to import and use those libraries.

This change adds the same filesystem overlay to dependency scanning queries by applying them to the filesystem instantiated for each depndency scanning worker. Without these overlays EBM builds cannot discover and use non-modular system libraries on non-Darwin platforms.

Resolves rdar://151780437

@artemcm
Copy link
Contributor Author

artemcm commented May 22, 2025

@swift-ci smoke test

Copy link
Contributor

@cachemeifyoucan cachemeifyoucan left a comment

Choose a reason for hiding this comment

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

Except minor coding style, LGTM.

Copy link
Contributor

Choose a reason for hiding this comment

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

I also prefer if we combine those two functions (or have the new function including the call to the first one).

I guess when caching is on, there is also no need to call the first function.

@artemcm artemcm force-pushed the ClangRemapsForDepScanQueries branch from ff95101 to 71efcc3 Compare May 29, 2025 17:08
@artemcm
Copy link
Contributor Author

artemcm commented May 29, 2025

@swift-ci smoke test

…pendency scanning query filesystem

On creation, 'ClangImporter' adds overlay modulemap files for non-modular platform libraries (e.g. glibc, libstdc++), which allows Swift code to import and use those libraries.

This change adds the same filesystem overlay to dependency scanning queries by applying them to the filesystem instantiated for each depndency scanning worker. Without these overlays EBM builds cannot discover and use non-modular system libraries on non-Darwin platforms.

Resolves rdar://151780437
@artemcm artemcm force-pushed the ClangRemapsForDepScanQueries branch from 71efcc3 to a9e0a58 Compare May 29, 2025 20:33
@artemcm
Copy link
Contributor Author

artemcm commented May 29, 2025

@swift-ci smoke test

@artemcm artemcm enabled auto-merge May 29, 2025 20:34
@artemcm artemcm merged commit 74e207b into swiftlang:main May 30, 2025
3 checks passed
@artemcm artemcm deleted the ClangRemapsForDepScanQueries branch July 22, 2025 20:15
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.

2 participants