diff options
| author | John Ericson <git@JohnEricson.me> | 2020-12-02 11:17:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 11:17:41 -0500 |
| commit | 8e21ce5faeda18a82f84ce4ee812ce3a1a81b399 (patch) | |
| tree | 62b18c56d1d61e34db23edb8328af1ce50453ef8 /pkgs/build-support | |
| parent | 68fa053f4697914bb1e7d9118484a39c650fd66b (diff) | |
| parent | 9918ba2dbaf2d6533baa53330a9ef9c32cfbf8a5 (diff) | |
Merge pull request #105294 from Ericson2314/platform-config-improvements
Platform config improvements
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 3b1b8ff570a8..6da0e58436d0 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -167,7 +167,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.isMips && !targetPlatform.isPower) "-"; + sep = optionalString (!targetPlatform.isMips && !targetPlatform.isPower && !targetPlatform.isRiscV) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" else if targetPlatform.isAarch32 then endianPrefix + "arm" @@ -187,6 +187,7 @@ stdenv.mkDerivation { else if targetPlatform.isAlpha then "alpha" else if targetPlatform.isVc4 then "vc4" else if targetPlatform.isOr1k then "or1k" + else if targetPlatform.isRiscV then "lriscv" else throw "unknown emulation for platform: ${targetPlatform.config}"; in if targetPlatform.useLLVM or false then "" else targetPlatform.platform.bfdEmulation or (fmt + sep + arch); |