Merge pull request #36129 from dtzWill/fix/bintools-aarch64
bintools-wrapper: fix breakage on aarch64, where "isArm" is false
This commit is contained in:
commit
632761bc20
|
@ -171,7 +171,7 @@ stdenv.mkDerivation {
|
||||||
else if targetPlatform.isWindows then "pe"
|
else if targetPlatform.isWindows then "pe"
|
||||||
else "elf" + toString targetPlatform.parsed.cpu.bits;
|
else "elf" + toString targetPlatform.parsed.cpu.bits;
|
||||||
endianPrefix = if targetPlatform.isBigEndian then "big" else "little";
|
endianPrefix = if targetPlatform.isBigEndian then "big" else "little";
|
||||||
sep = optionalString (targetPlatform.isx86 || targetPlatform.isArm) "-";
|
sep = optionalString (!targetPlatform.isMips) "-";
|
||||||
arch =
|
arch =
|
||||||
/**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
|
/**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
|
||||||
else if targetPlatform.isArm then endianPrefix + "arm"
|
else if targetPlatform.isArm then endianPrefix + "arm"
|
||||||
|
|
Loading…
Reference in a new issue