[clang] Match -isysroot behaviour with system compiler on Darwin #8116
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
The current Apple Clang behaviour is to prefer `-isysroot` vs libc++ headers side-by-side the compiler. This has been like that for several Xcode versions, at least since Xcode 14. The code was originally written in D89001 chosing the order that was correct at the time for Apple Clang. In 2023 D157283 tried to flip the order to match the current Apple Clang, but was reverted in 3197357 because it brokes two tests. The code was further changed in llvm#70817 to add a third option. The changes in this commit try to match Apple Clang, and incorporate the changes in llvm#70817, as well as fixing the tests that broke when D157283 was applied.
|
Sorry, intended for upstream. |
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.
The current Apple Clang behaviour is to prefer
-isysrootvs libc++ headers side-by-side the compiler. This has been like that for several Xcode versions, at least since Xcode 14.The code was originally written in D89001 chosing the order that was correct at the time for Apple Clang. In 2023 D157283 tried to flip the order to match the current Apple Clang, but was reverted in 3197357 because it brokes two tests. The code was further changed in llvm#70817 to add a third option.
The changes in this commit try to match Apple Clang, and incorporate the changes in llvm#70817, as well as fixing the tests that broke when D157283 was applied.