mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
Revert "pkgs/top-level/stage.nix: add pkgsLLVMLibc"
This reverts commit 41b14024d2.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -386,7 +386,6 @@ rec {
|
||||
uclibceabi
|
||||
uclibceabihf
|
||||
];
|
||||
isLLVMLibc = [ { abi = abis.llvm; } ];
|
||||
|
||||
isEfi = [
|
||||
{
|
||||
|
||||
@@ -740,9 +740,6 @@ rec {
|
||||
};
|
||||
uclibc = { };
|
||||
|
||||
# LLVM libc
|
||||
llvm = { };
|
||||
|
||||
unknown = { };
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user