Merge pull request #36129 from dtzWill/fix/bintools-aarch64

bintools-wrapper: fix breakage on aarch64, where "isArm" is false
This commit is contained in:
John Ericson 2018-02-28 10:49:35 -05:00 committed by GitHub
commit 632761bc20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -171,7 +171,7 @@ stdenv.mkDerivation {
else if targetPlatform.isWindows then "pe"
else "elf" + toString targetPlatform.parsed.cpu.bits;
endianPrefix = if targetPlatform.isBigEndian then "big" else "little";
sep = optionalString (targetPlatform.isx86 || targetPlatform.isArm) "-";
sep = optionalString (!targetPlatform.isMips) "-";
arch =
/**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
else if targetPlatform.isArm then endianPrefix + "arm"