Revert "pkgs/top-level/stage.nix: add pkgsLLVMLibc"

This reverts commit 41b14024d2.
This commit is contained in:
zowoq 2025-04-24 14:00:21 +10:00
parent 1eace4c7ae
commit 0931f4e861
6 changed files with 1 additions and 36 deletions

View file

@ -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

View file

@ -386,7 +386,6 @@ rec {
uclibceabi
uclibceabihf
];
isLLVMLibc = [ { abi = abis.llvm; } ];
isEfi = [
{

View file

@ -740,9 +740,6 @@ rec {
};
uclibc = { };
# LLVM libc
llvm = { };
unknown = { };
};

View file

@ -50,7 +50,6 @@ let
# cross packagesets
pkgsLLVM = true;
pkgsLLVMLibc = true;
pkgsMusl = true;
pkgsStatic = true;
pkgsCross = true;

View file

@ -382,10 +382,6 @@ let
"x86_64-linux"
"aarch64-linux"
];
pkgsLLVMLibc.stdenv = [
"x86_64-linux"
"aarch64-linux"
];
pkgsArocc.stdenv = [
"x86_64-linux"
"aarch64-linux"

View file

@ -115,15 +115,6 @@ let
}
);
makeLLVMParsedPlatform =
parsed:
(
parsed
// {
abi = lib.systems.parse.abis.llvm;
}
);
stdenvAdapters =
self: super:
let
@ -246,21 +237,6 @@ let
};
};
pkgsLLVMLibc = nixpkgsFun {
overlays = [
(self': super': {
pkgsLLVMLibc = super';
})
] ++ overlays;
# Bootstrap a cross stdenv using LLVM libc.
# This is currently not possible when compiling natively,
# so we don't need to check hostPlatform != buildPlatform.
crossSystem = stdenv.hostPlatform // {
config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);
libc = "llvm";
};
};
pkgsArocc = nixpkgsFun {
overlays = [
(self': super': {