nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

go_1_11: Allow only one of GOARM={5,6,7}

Browse Source 
(cherry picked from commit e153a988ec)
Backport of #46031 to release-18.09
This commit is contained in:
Sarah Brofeldt
2018-09-05 01:05:22 +02:00
parent 2c844ce13a
commit 3e87977e38
1 changed files with 1 additions and 1 deletions
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.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";