diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-26 00:05:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 00:05:43 +0000 |
| commit | 527dacdda61779b75ea6340b133ae2034d17449a (patch) | |
| tree | aa824e4cd0e6be72e9c6d3fcd470cc3b09d823aa /pkgs/build-support | |
| parent | 0dfed52fcf6184c25eefc0ee18330d631e6c7af5 (diff) | |
| parent | 8dee9de4781564940cfa8145c7a0f409041ef646 (diff) | |
| download | nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.gz nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.bz2 nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.lz nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.xz nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.zst nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 0674c88924e..82d17369743 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -209,6 +209,7 @@ stdenv.mkDerivation { else if targetPlatform.isVc4 then "vc4" else if targetPlatform.isOr1k then "or1k" else if targetPlatform.isM68k then "m68k" + else if targetPlatform.isS390 then "s390" else if targetPlatform.isRiscV then "lriscv" else throw "unknown emulation for platform: ${targetPlatform.config}"; in if targetPlatform.useLLVM or false then "" |