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

Merge pull request #46031 from srhb/fix-go-on-aarch64

Browse Source 
go_1_11: Allow only one of GOARM={5,6,7}
This commit is contained in:
Sarah Brofeldt 2018-09-05 01:05:22 +02:00 committed by GitHub
commit e153a988ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/go/1.11.nix
View File

@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
else if stdenv.targetPlatform.isAarch32 then "arm" else if stdenv.targetPlatform.isAarch32 then "arm"
else if stdenv.targetPlatform.isAarch64 then "arm64" else if stdenv.targetPlatform.isAarch64 then "arm64"
else throw "Unsupported system"; else throw "Unsupported system";
GOARM = stdenv.targetPlatform.parsed.cpu.version or ""; GOARM = toString (stdenv.lib.intersectLists [(stdenv.targetPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
GO386 = 387; # from Arch: don't assume sse2 on i686 GO386 = 387; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1; CGO_ENABLED = 1;
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";