diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-25 00:05:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 00:05:51 +0000 |
| commit | 0dfed52fcf6184c25eefc0ee18330d631e6c7af5 (patch) | |
| tree | 9fd6164e718b593d54d1cba94077b4d14b23cea8 /pkgs/build-support | |
| parent | 0783d5d3b7a9a8cae8404d92b9dd8828e49aefd5 (diff) | |
| parent | ecaf3da9340231e5493eccc3db87604a3705da42 (diff) | |
| download | nixpkgs-0dfed52fcf6184c25eefc0ee18330d631e6c7af5.tar nixpkgs-0dfed52fcf6184c25eefc0ee18330d631e6c7af5.tar.gz nixpkgs-0dfed52fcf6184c25eefc0ee18330d631e6c7af5.tar.bz2 nixpkgs-0dfed52fcf6184c25eefc0ee18330d631e6c7af5.tar.lz nixpkgs-0dfed52fcf6184c25eefc0ee18330d631e6c7af5.tar.xz nixpkgs-0dfed52fcf6184c25eefc0ee18330d631e6c7af5.tar.zst nixpkgs-0dfed52fcf6184c25eefc0ee18330d631e6c7af5.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 5d2f2f977a7..0674c88924e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -208,6 +208,7 @@ stdenv.mkDerivation { else if targetPlatform.isAlpha then "alpha" else if targetPlatform.isVc4 then "vc4" else if targetPlatform.isOr1k then "or1k" + else if targetPlatform.isM68k then "m68k" else if targetPlatform.isRiscV then "lriscv" else throw "unknown emulation for platform: ${targetPlatform.config}"; in if targetPlatform.useLLVM or false then "" |