darwin/make-bootstrap-tools: move "lib" from install name to rpath#124228
Merged
jonringer merged 1 commit intoNixOS:masterfrom May 26, 2021
Merged
darwin/make-bootstrap-tools: move "lib" from install name to rpath#124228jonringer merged 1 commit intoNixOS:masterfrom
jonringer merged 1 commit intoNixOS:masterfrom
Conversation
The rpath structure for the bootstrap tools was reworked to minimize the amount of rewriting required on unpack, but the test was not updated to match the different structure. Additionally [1] builds that use the bootstrap version of libc++ cannot find libc++abi if the reference includes the "lib" component (ie, libc++ refers to libc++abi with @rpath/lib/libc++abi.dylib). [1] https://logs.nix.samueldr.com/nix-darwin/2021-05-18#4993282 Test failure observed on Hydra: https://hydra.nixos.org/build/143130126
Contributor
|
This seems to have solved two of my problems. I cherry-picked this commit then generated an LLVM 11 bootstrap-tools (from LLVM 7 bootstrap-tools and stdenv, this part already worked). I then used this LLVM 11 bootstrap-tools in generating another LLVM 11 bootstrap-tools, this time based on an LLVM 11 stdenv. Another step closer to LLVM 11 stdenv for x86_64 darwin! \o/ |
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
3 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.
The rpath structure for the bootstrap tools was reworked to minimize
the amount of rewriting required on unpack, but the test was not
updated to match the different structure.
Additionally [1] builds that use the bootstrap version of libc++
cannot find libc++abi if the reference includes the "lib"
component (ie, libc++ refers to libc++abi with
@rpath/lib/libc++abi.dylib).
[1] https://logs.nix.samueldr.com/nix-darwin/2021-05-18#4993282
Test failure observed on Hydra: https://hydra.nixos.org/build/143130126
Motivation for this change
Fix channel blocking bootstrap tools test.
Tested the
testattribute of bootstrap tools, but not the resulting full stdenv rebuild.cc @toonn
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)