From f061f3ead59edc78259f537669afb15ac268e055 Mon Sep 17 00:00:00 2001 From: Boey Maun Suang Date: Sun, 1 Jan 2023 10:23:57 +1100 Subject: [PATCH] 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. --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a3066f5a4d1..32bf99f1c449 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };