Merge pull request #324579 from reckenrode/make-bootstrap-tools-fix
stdenv/darwin/make-bootstrap-tools.nix: use darwin.binutils-unwrapped
This commit is contained in:
@@ -40,8 +40,6 @@ rec {
|
||||
NIX_LDFLAGS = (oa.NIX_LDFLAGS or "") + " -headerpad_max_install_names";
|
||||
});
|
||||
|
||||
cctools_ = darwin.cctools;
|
||||
|
||||
# Avoid messing with libkrb5 and libnghttp2.
|
||||
curl_ = curlMinimal.override (args: {
|
||||
gssSupport = false;
|
||||
@@ -112,7 +110,7 @@ rec {
|
||||
|
||||
# Copy binutils.
|
||||
for i in as ld ar ranlib nm strip otool install_name_tool lipo codesign_allocate; do
|
||||
cp ${getBin cctools_}/bin/$i $out/bin
|
||||
cp ${getBin darwin.binutils-unwrapped}/bin/$i $out/bin
|
||||
done
|
||||
|
||||
# Copy coreutils, bash, etc.
|
||||
|
||||
Reference in New Issue
Block a user