configd: fix build with newer LLVM and bootstrap#234857
Merged
toonn merged 2 commits intoNixOS:stagingfrom Jun 5, 2023
Merged
Conversation
Clang 15 does not like the fake xpc headers. Use the real ones instead. Doing this no longer causes an infinite recursion because xnu now depends on python3Minimal, which does not include configd support.
The 10.12 SDK uses `xar`, which depends on Python indirectly, which depends on configd by default. This causes an infinite recuresion when building configd because it needs SDK headers to build with clang 16. Fix the infinite recursion by disabling Python support in libxml2 when building the SDK, and use a minimal Python in the SDK build itself.
Contributor
Author
|
@toonn I think I fixed the infinite recursion. The problem with making configd use SDK headers is building the SDK requires Python, which requires configd. I swapped to a minimal Python and overrode xar not to need Python. Unfortunately, this one slipped through the cracks because the gnugrep issue has made it difficult to continue testing on x86_64-darwin. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description of changes
Clang 15 does not like the fake xpc headers. Use the real ones instead. Doing this no longer causes an infinite recursion because xnu now depends on python3Minimal, which does not include configd support.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)