diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-02-28 10:49:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 10:49:35 -0500 |
| commit | 632761bc20a58b87dd39fd8d016b78d96c6cff45 (patch) | |
| tree | 1fc17a79458b9d0d5c0e7ab62b09a2c3112f8542 | |
| parent | 4f6b085c5e4421606e9878ae09d4bb104dba89ed (diff) | |
| parent | f14ff86ec92260ffa3225622a8b813b99eac3ae4 (diff) | |
| download | nixlib-632761bc20a58b87dd39fd8d016b78d96c6cff45.tar nixlib-632761bc20a58b87dd39fd8d016b78d96c6cff45.tar.gz nixlib-632761bc20a58b87dd39fd8d016b78d96c6cff45.tar.bz2 nixlib-632761bc20a58b87dd39fd8d016b78d96c6cff45.tar.lz nixlib-632761bc20a58b87dd39fd8d016b78d96c6cff45.tar.xz nixlib-632761bc20a58b87dd39fd8d016b78d96c6cff45.tar.zst nixlib-632761bc20a58b87dd39fd8d016b78d96c6cff45.zip | |
Merge pull request #36129 from dtzWill/fix/bintools-aarch64
bintools-wrapper: fix breakage on aarch64, where "isArm" is false
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 98b40114c694..8e94ccfa49bc 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -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" |