b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnatboot12: Use bintoolsDualAs on x86_64-darwin

Browse source 
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.
This commit is contained in:
Boey Maun Suang 2023-01-01 10:23:57 +11:00
parent 82b88d2db6
commit f061f3ead5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View file

@ -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 { };