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

This reverts commit 41b14024d24bd7488b58d7a252f8f16b194d57f9.

zowoq 0931f4e8 1eace4c7

+1 -36
+1 -3
lib/systems/default.nix
··· 121 "uclibc" 122 else if final.isAndroid then 123 "bionic" 124 - else if final.isLLVMLibc then 125 - "llvm" 126 else if 127 final.isLinux # default 128 then ··· 248 # don't support dynamic linking, but don't get the `staticMarker`. 249 # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always 250 # has the `staticMarker`. 251 - isStatic = final.isWasi || final.isRedox || final.isLLVMLibc; 252 253 # Just a guess, based on `system` 254 inherit
··· 121 "uclibc" 122 else if final.isAndroid then 123 "bionic" 124 else if 125 final.isLinux # default 126 then ··· 246 # don't support dynamic linking, but don't get the `staticMarker`. 247 # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always 248 # has the `staticMarker`. 249 + isStatic = final.isWasi || final.isRedox; 250 251 # Just a guess, based on `system` 252 inherit
-1
lib/systems/inspect.nix
··· 386 uclibceabi 387 uclibceabihf 388 ]; 389 - isLLVMLibc = [ { abi = abis.llvm; } ]; 390 391 isEfi = [ 392 {
··· 386 uclibceabi 387 uclibceabihf 388 ]; 389 390 isEfi = [ 391 {
-3
lib/systems/parse.nix
··· 740 }; 741 uclibc = { }; 742 743 - # LLVM libc 744 - llvm = { }; 745 - 746 unknown = { }; 747 }; 748
··· 740 }; 741 uclibc = { }; 742 743 unknown = { }; 744 }; 745
-1
pkgs/top-level/release-attrpaths-superset.nix
··· 50 51 # cross packagesets 52 pkgsLLVM = true; 53 - pkgsLLVMLibc = true; 54 pkgsMusl = true; 55 pkgsStatic = true; 56 pkgsCross = true;
··· 50 51 # cross packagesets 52 pkgsLLVM = true; 53 pkgsMusl = true; 54 pkgsStatic = true; 55 pkgsCross = true;
-4
pkgs/top-level/release.nix
··· 382 "x86_64-linux" 383 "aarch64-linux" 384 ]; 385 - pkgsLLVMLibc.stdenv = [ 386 - "x86_64-linux" 387 - "aarch64-linux" 388 - ]; 389 pkgsArocc.stdenv = [ 390 "x86_64-linux" 391 "aarch64-linux"
··· 382 "x86_64-linux" 383 "aarch64-linux" 384 ]; 385 pkgsArocc.stdenv = [ 386 "x86_64-linux" 387 "aarch64-linux"
-24
pkgs/top-level/stage.nix
··· 115 } 116 ); 117 118 - makeLLVMParsedPlatform = 119 - parsed: 120 - ( 121 - parsed 122 - // { 123 - abi = lib.systems.parse.abis.llvm; 124 - } 125 - ); 126 - 127 stdenvAdapters = 128 self: super: 129 let ··· 243 crossSystem = stdenv.hostPlatform // { 244 useLLVM = true; 245 linker = "lld"; 246 - }; 247 - }; 248 - 249 - pkgsLLVMLibc = nixpkgsFun { 250 - overlays = [ 251 - (self': super': { 252 - pkgsLLVMLibc = super'; 253 - }) 254 - ] ++ overlays; 255 - # Bootstrap a cross stdenv using LLVM libc. 256 - # This is currently not possible when compiling natively, 257 - # so we don't need to check hostPlatform != buildPlatform. 258 - crossSystem = stdenv.hostPlatform // { 259 - config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed); 260 - libc = "llvm"; 261 }; 262 }; 263
··· 115 } 116 ); 117 118 stdenvAdapters = 119 self: super: 120 let ··· 234 crossSystem = stdenv.hostPlatform // { 235 useLLVM = true; 236 linker = "lld"; 237 }; 238 }; 239