From 3e87977e383714c05ab51d406d46ccd3b66e0120 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 5 Sep 2018 01:05:22 +0200 Subject: [PATCH] go_1_11: Allow only one of GOARM={5,6,7} (cherry picked from commit e153a988ecb04941b63b128fa4c99a4398fd5e5e) Backport of #46031 to release-18.09 --- pkgs/development/compilers/go/1.11.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 55cc654b0aa9..237f74e319f7 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -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";