mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 01:57:37 +03:00
Merge pull request #46031 from srhb/fix-go-on-aarch64
go_1_11: Allow only one of GOARM={5,6,7}
This commit is contained in:
commit
e153a988ec
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
|
||||
else if stdenv.targetPlatform.isAarch32 then "arm"
|
||||
else if stdenv.targetPlatform.isAarch64 then "arm64"
|
||||
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
|
||||
CGO_ENABLED = 1;
|
||||
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
|
||||
|
Loading…
Reference in New Issue
Block a user