diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2025-04-24 14:00:21 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2025-04-24 14:04:25 +1000 |
| commit | 0931f4e8618417869bb2cbfddfcb4baecfa20f56 (patch) | |
| tree | d7d9e8c211e88b339406811b347896a9fc1e6f1f /lib/systems | |
| parent | tumiki-fighters: fix build (#401185) (diff) | |
| download | nixpkgs-0931f4e8618417869bb2cbfddfcb4baecfa20f56.tar.gz | |
Revert "pkgs/top-level/stage.nix: add pkgsLLVMLibc"
This reverts commit 41b14024d24bd7488b58d7a252f8f16b194d57f9.
Diffstat (limited to 'lib/systems')
| -rw-r--r-- | lib/systems/default.nix | 4 | ||||
| -rw-r--r-- | lib/systems/inspect.nix | 1 | ||||
| -rw-r--r-- | lib/systems/parse.nix | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index a19972326195..ce257d5307b6 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -121,8 +121,6 @@ let "uclibc" else if final.isAndroid then "bionic" - else if final.isLLVMLibc then - "llvm" else if final.isLinux # default then @@ -248,7 +246,7 @@ let # don't support dynamic linking, but don't get the `staticMarker`. # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always # has the `staticMarker`. - isStatic = final.isWasi || final.isRedox || final.isLLVMLibc; + isStatic = final.isWasi || final.isRedox; # Just a guess, based on `system` inherit diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index c330d5473bc5..58654a49e008 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -386,7 +386,6 @@ rec { uclibceabi uclibceabihf ]; - isLLVMLibc = [ { abi = abis.llvm; } ]; isEfi = [ { diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index ec773c824def..0dfd91b7bb76 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -740,9 +740,6 @@ rec { }; uclibc = { }; - # LLVM libc - llvm = { }; - unknown = { }; }; |