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 = { }; }; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index 09cdc734c78d..968ca142ecf7 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -50,7 +50,6 @@ let # cross packagesets pkgsLLVM = true; - pkgsLLVMLibc = true; pkgsMusl = true; pkgsStatic = true; pkgsCross = true; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c33ef2405f33..be79f78d0d94 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -382,10 +382,6 @@ let "x86_64-linux" "aarch64-linux" ]; - pkgsLLVMLibc.stdenv = [ - "x86_64-linux" - "aarch64-linux" - ]; pkgsArocc.stdenv = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index bd0dcf9e0473..96725dd966bf 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -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': {