git.iko.soy/typeable/nixpkgs
on master help sign in
lib: Fix Mingw on 32-bit ARM
commit3bf0e4efc751b4f8d647c5521f317c44b5f9c4a3 authorJohn Ericson <git@JohnEricson.me> dateSat 29 Dec 2018, 03:25 (8 years ago) parent94164f0
1 file changed+9−4
lib/systems/parse.nix+9−4
lib/systems/parse.nix+9−4
@@ -279,8 +279,14 @@ rec {
279279 "2" = # We only do 2-part hacks for things Nix already supports
280280 if elemAt l 1 == "cygwin"
281281 then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; }
282+ # MSVC ought to be the default ABI so this case isn't needed. But then it
283+ # becomes difficult to handle the gnu* variants for Aarch32 correctly for
284+ # minGW. So it's easier to make gnu* the default for the MinGW, but
285+ # hack-in MSVC for the non-MinGW case right here.
286+ else if elemAt l 1 == "windows"
287+ then { cpu = elemAt l 0; kernel = "windows"; abi = "msvc"; }
282288 else if (elemAt l 1) == "elf"
283− then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
289+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
284290 else { cpu = elemAt l 0; kernel = elemAt l 1; };
285291 "3" = # Awkwards hacks, beware!
286292 if elemAt l 1 == "apple"
@@ -288,7 +294,7 @@ rec {
288294 else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
289295 then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; }
290296 else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
291− then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; }
297+ then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; }
292298 else if hasPrefix "netbsd" (elemAt l 2)
293299 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
294300 else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
@@ -324,13 +330,12 @@ rec {
324330 else getKernel args.kernel;
325331 abi =
326332 /**/ if args ? abi then getAbi args.abi
327− else if isLinux parsed then
333+ else if isLinux parsed || isWindows parsed then
328334 if isAarch32 parsed then
329335 if lib.versionAtLeast (parsed.cpu.version or "0") "6"
330336 then abis.gnueabihf
331337 else abis.gnueabi
332338 else abis.gnu
333− else if isWindows parsed then abis.gnu
334339 else abis.unknown;
335340 };
336341