freshBootstrapTools.bootstrapTools: update for new SDK pattern #348000
Conversation
This file contains 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
|
Any tips on testing this Randy? I'd be happy to get a machine cranking. |
|
The following will build the bootstrap tools then rebuild the stdenv with them. Note that you’ll probably also have to rebuild the stdenv first since this is going to staging due to depending on the new SDK stuff. |
paparodeo
reviewed
Oct 11, 2024
| @@ -30,7 +31,7 @@ builtins.derivation { | |||
| mkdir -p $out/bin | |||
|
|
|||
| for exe in $tools/bin/*; do | |||
| [[ $exe =~ bunzip2|codesign.*|false|install_name_tool|ld|lipo|pbzx|ranlib|rewrite-tbd|sigtool ]] && continue | |||
| [[ $exe =~ bunzip2|codesign.*|false|install_name_tool|jq|ld|lipo|pbzx|ranlib|sigtool|tapi ]] && continue | |||
There was a problem hiding this comment.
jq should support jq --version and return 0 so the test passes. is there a way to run tapi that will return 0, maybe tapi -h or tapi -v ? if so can just add below sigtool -h so all programs get run in the test.
There was a problem hiding this comment.
tapi supports --version
./tapi --version
TAPI version 15.0.0 (tapi-1500.0.12.3)There was a problem hiding this comment.
Oh, right. Exclusion list. I’ll drop jq and tapi from it.
- Drop libSystem. It’s no longer needed. The SDK can be downloaded and built with existing tools. - Add jq and tapi. Adding these allows the stdenv bootstrap to stop special-casing stage 0. - Update tests for updated ld64. It handles code-signing properly, so the signatures aren’t broken.
reckenrode
force-pushed
the
push-runnqxlrlrmu
branch
from
7cf20a0 to
22885f8
Compare
paparodeo
approved these changes
Oct 11, 2024
ofborg
bot
added
10.rebuild-darwin: 0
emilazy
approved these changes
Oct 13, 2024
13 tasks
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.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.