summary refs log tree commit diff
path: root/lib/systems/default.nix
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2020-02-22 15:36:03 -0500
committerGitHub <noreply@github.com>2020-02-22 15:36:03 -0500
commit2682170f21a8ef64deeee64705e7807b8a04ff66 (patch)
treec33e4301e9de604bb15fe4116aab9a4f6c3a60a5 /lib/systems/default.nix
parentdf54d70e3e15b3f91018f1608353724be5081f5e (diff)
parent8009c2071179ee3490f244b91a49202728efe403 (diff)
downloadnixpkgs-2682170f21a8ef64deeee64705e7807b8a04ff66.tar
nixpkgs-2682170f21a8ef64deeee64705e7807b8a04ff66.tar.gz
nixpkgs-2682170f21a8ef64deeee64705e7807b8a04ff66.tar.bz2
nixpkgs-2682170f21a8ef64deeee64705e7807b8a04ff66.tar.lz
nixpkgs-2682170f21a8ef64deeee64705e7807b8a04ff66.tar.xz
nixpkgs-2682170f21a8ef64deeee64705e7807b8a04ff66.tar.zst
nixpkgs-2682170f21a8ef64deeee64705e7807b8a04ff66.zip
Merge pull request #80814 from matthewbauer/default-newlib-for-none
lib/systems: Assume newlib when no kernel and no libc is provided
Diffstat (limited to 'lib/systems/default.nix')
-rw-r--r--lib/systems/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 36afdae3866..4ca932d1792 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -36,9 +36,8 @@ rec {
         else if final.isUClibc              then "uclibc"
         else if final.isAndroid             then "bionic"
         else if final.isLinux /* default */ then "glibc"
-        else if final.isMsp430              then "newlib"
-        else if final.isVc4                 then "newlib"
         else if final.isAvr                 then "avrlibc"
+        else if final.isNone                then "newlib"
         else if final.isNetBSD              then "nblibc"
         # TODO(@Ericson2314) think more about other operating systems
         else                                     "native/impure";