JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go*: fix aarch64 build

Browse Source 
Some tests don't work well with gcc9 atm, those tests use CC from
`buildPackages.stdenv.cc` which had to be modified for Aarch64 as well.
This commit is contained in:
Maximilian Bosch 2019-12-30 12:32:16 +01:00
parent 0852b7d5bb
commit 7acacddfa5
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/top-level/all-packages.nix
View File

@ -8225,15 +8225,19 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
go_1_12 = callPackage ../development/compilers/go/1.12.nix {
go_1_12 = callPackage ../development/compilers/go/1.12.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
stdenv = if stdenv.isAarch64 then gcc8Stdenv else stdenv;
};
} // lib.optionalAttrs stdenv.isAarch64 {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
});
go_1_13 = callPackage ../development/compilers/go/1.13.nix {
go_1_13 = callPackage ../development/compilers/go/1.13.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
stdenv = if stdenv.isAarch64 then gcc8Stdenv else stdenv;
};
} // lib.optionalAttrs stdenv.isAarch64 {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
});
go = go_1_13;