Merged
Conversation
Sometimes, builds only call xcrun for very basic detection. This exposes a `xcbuild.xcrun` that has a significantly simpler closure. (It's just some files and shell scripts.)
ofborg
bot
added
10.rebuild-darwin: 501+
matthewbauer
approved these changes
Aug 10, 2022
Member
matthewbauer
left a comment
matthewbauer
left a comment
There was a problem hiding this comment.
Looks good to me. Haven't tested it or anything, but I think the tests are somewhat comprehensive.
Contributor
Author
|
Hmm, should I target staging for this? It doesn't touch stdenv, but I didn't realize it'd be 5001+. 🙃 |
Member
I think it's fine to go to master. IIRC it's not a lot more than 5000. |
Contributor
|
Almost 17000 rebuilds across both darwin platforms, this should go to staging. |
Contributor
Author
|
I updated the base branch to staging. |
bobby285271
added
the
12.approvals: 1
13 tasks
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
4 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
These tweaks specifically target LLVM compiler-rt, which I need to modify for Darwin.
The LLVM build tries to call
xcrunbut we currently don't make it available and ignore the errors. That's disabling critical functionality however. A change in this PR makesxcrunavailable separately, which is just a bunch of files and shell scripts. That makes it much easier to put it in the closure of stdenv on Darwin.The other change is to actually check the
-sdkflag if passed. The LLVM build callsxcrunmultiple times to detect different SDKs, but it should only succeed for the target platform.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/)nixos/doc/manual/md-to-db.shto update generated release notes