Skip to content

[build] Remove unused GLIBC_INCLUDE_PATH macro #60956

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 6, 2022

Conversation

egorzhdan
Copy link
Contributor

This macro was previously substituted when generating glibc.modulemap file during the compiler build. Now Swift detects the location of Glibc dynamically and injects glibc.modulemap into it using LLVM VFS. The last usage of GLIBC_INCLUDE_PATH was removed in 78c0540.

This also removes SWIFT_SDK_${sdk}_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY which doesn't have any usages left.

@egorzhdan
Copy link
Contributor Author

cc @buttaface @3405691582

@egorzhdan
Copy link
Contributor Author

@swift-ci please smoke test

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Seems like a reasonable cleanup.

Copy link
Member

@finagolfin finagolfin left a comment

Choose a reason for hiding this comment

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

Glad to see this gone, but you missed one that @3405691582 added recently.

Pinging @kateinoigakukun to sign off on WASI change.

This macro was previously substituted when generating `glibc.modulemap` file during the compiler build. Now Swift detects the location of Glibc dynamically and injects `glibc.modulemap` into it using LLVM VFS. The last usage of `GLIBC_INCLUDE_PATH` was removed in `78c0540b`.

This also removes `SWIFT_SDK_${sdk}_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY` which doesn't have any usages left.
@egorzhdan egorzhdan force-pushed the egorzhdan/no-libc-path branch from 752ae7b to ba31ca4 Compare September 5, 2022 17:58
@egorzhdan
Copy link
Contributor Author

Glad to see this gone, but you missed one that @3405691582 added recently.

Thanks, forgot to update my checkout :)

@egorzhdan
Copy link
Contributor Author

@swift-ci please smoke test

Copy link
Member

@kateinoigakukun kateinoigakukun left a comment

Choose a reason for hiding this comment

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

Thank you for cleaning up :)

@egorzhdan egorzhdan merged commit e7d55b2 into main Sep 6, 2022
@egorzhdan egorzhdan deleted the egorzhdan/no-libc-path branch September 6, 2022 09:41
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