Unverified Commit b3f38463 authored by Randy Eckenrode's avatar Randy Eckenrode Committed by GitHub
Browse files

Merge pull request #324579 from reckenrode/make-bootstrap-tools-fix 

stdenv/darwin/make-bootstrap-tools.nix: use darwin.binutils-unwrapped
parents 8f211a93 75504615

pkgs/stdenv/darwin/make-bootstrap-tools.nix

+1 −3
Original line number Diff line number Diff line
@@ -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.