go: Fix build when targetting MinGW

+13 -3
+13 -3
pkgs/development/compilers/go/1.17.nix
··· 18 18 , buildPackages 19 19 , pkgsBuildTarget 20 20 , callPackage 21 + , threadsCross ? null # for MinGW 21 22 }: 23 + 24 + # threadsCross is just for MinGW 25 + assert threadsCross != null -> stdenv.targetPlatform.isWindows; 22 26 23 27 let 24 28 go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; ··· 50 54 # We need a target compiler which is still runnable at build time, 51 55 # to handle the cross-building case where build != host == target 52 56 targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; 57 + 58 + isCross = stdenv.buildPlatform != stdenv.targetPlatform; 53 59 in 54 60 55 61 stdenv.mkDerivation rec { ··· 70 76 propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; 71 77 72 78 depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; 79 + 80 + depsBuildTarget = lib.optional isCross targetCC; 81 + 82 + depsTargetTarget = lib.optional (threadsCross != null) threadsCross; 73 83 74 84 hardeningDisable = [ "all" ]; 75 85 ··· 194 204 # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those 195 205 # to be different from CC/CXX 196 206 CC_FOR_TARGET = 197 - if (stdenv.buildPlatform != stdenv.targetPlatform) then 207 + if isCross then 198 208 "${targetCC}/bin/${targetCC.targetPrefix}cc" 199 209 else 200 210 null; 201 211 CXX_FOR_TARGET = 202 - if (stdenv.buildPlatform != stdenv.targetPlatform) then 212 + if isCross then 203 213 "${targetCC}/bin/${targetCC.targetPrefix}c++" 204 214 else 205 215 null; ··· 223 233 224 234 export PATH=$(pwd)/bin:$PATH 225 235 226 - ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' 236 + ${lib.optionalString isCross '' 227 237 # Independent from host/target, CC should produce code for the building system. 228 238 # We only set it when cross-compiling. 229 239 export CC=${buildPackages.stdenv.cc}/bin/cc