[ClangImporter] Add the sysroot directly to the clang Driver used to find the libc header path #60804
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…find the libc header path `getToolChain()` and `AddClangSystemIncludeArgs()` don't parse the arguments to set the sysroot, so set it directly instead. Also, remove a redundant check for a valid directory. Fixes swiftlang#60224
|
This seems to build successfully on Linux->OpenBSD cross-compile. I'll just try a clean from-scratch cross-compile just to be certain, but looking good so far. |
|
I thought I found an issue, but it's not attributable to your pr. |
|
I think this LGTM with a from-scratch cross-compile build. |
|
@swift-ci please smoke test |
|
@egorzhdan, please go ahead and merge, I'd like to use this in the next trunk snapshot. |
|
Thanks, this got the community Android CI building the stdlib again, now to look into the failing tests because of other unrelated issues. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
getToolChain()andAddClangSystemIncludeArgs()don't parse the arguments to set the sysroot, so set it directly instead. Also, remove a redundant check for a valid directory.Fixes #60224
@egorzhdan, let me know what you think, this fixes the issue with cross-compiling the stdlib from linux to Android.
@3405691582, please try it out with your OpenBSD cross-compile.