Commit f061f3ea authored by Boey Maun Suang's avatar Boey Maun Suang
Browse files

gnatboot12: Use bintoolsDualAs on x86_64-darwin 

As documented in pkgs/os-specific/darwin/binutils/default.nix,
the Clang integrated assembler is needed in addition to the cctools-port
assembler usually used on x86_64-darwin in order to build gnat12 with
the x86_64-darwin gnatboot12 bootstrap compiler.  This commit alters the
gnatboot12 wrapper on x86_64-darwin so that both of those assemblers are
available as required.
parent 82b88d2d

pkgs/top-level/all-packages.nix

+5 −1
Original line number Diff line number Diff line
@@ -14495,7 +14495,11 @@ with pkgs; 














  gnatboot = gnatboot12;















  gnatboot11 = wrapCC (callPackage ../development/compilers/gnatboot { majorVersion = "11"; });













  gnatboot12 = wrapCC (callPackage ../development/compilers/gnatboot { majorVersion = "12"; });













  gnatboot12 = wrapCCWith ({













    cc = callPackage ../development/compilers/gnatboot { majorVersion = "12"; };













  } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {













    bintools = bintoolsDualAs;













  });





























  gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { };