mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
Revert "pkgs/top-level/stage.nix: add pkgsLLVMLibc"
This reverts commit 41b14024d2
.
This commit is contained in:
parent
1eace4c7ae
commit
0931f4e861
6 changed files with 1 additions and 36 deletions
|
@ -121,8 +121,6 @@ let
|
||||||
"uclibc"
|
"uclibc"
|
||||||
else if final.isAndroid then
|
else if final.isAndroid then
|
||||||
"bionic"
|
"bionic"
|
||||||
else if final.isLLVMLibc then
|
|
||||||
"llvm"
|
|
||||||
else if
|
else if
|
||||||
final.isLinux # default
|
final.isLinux # default
|
||||||
then
|
then
|
||||||
|
@ -248,7 +246,7 @@ let
|
||||||
# don't support dynamic linking, but don't get the `staticMarker`.
|
# don't support dynamic linking, but don't get the `staticMarker`.
|
||||||
# `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
|
# `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
|
||||||
# has the `staticMarker`.
|
# has the `staticMarker`.
|
||||||
isStatic = final.isWasi || final.isRedox || final.isLLVMLibc;
|
isStatic = final.isWasi || final.isRedox;
|
||||||
|
|
||||||
# Just a guess, based on `system`
|
# Just a guess, based on `system`
|
||||||
inherit
|
inherit
|
||||||
|
|
|
@ -386,7 +386,6 @@ rec {
|
||||||
uclibceabi
|
uclibceabi
|
||||||
uclibceabihf
|
uclibceabihf
|
||||||
];
|
];
|
||||||
isLLVMLibc = [ { abi = abis.llvm; } ];
|
|
||||||
|
|
||||||
isEfi = [
|
isEfi = [
|
||||||
{
|
{
|
||||||
|
|
|
@ -740,9 +740,6 @@ rec {
|
||||||
};
|
};
|
||||||
uclibc = { };
|
uclibc = { };
|
||||||
|
|
||||||
# LLVM libc
|
|
||||||
llvm = { };
|
|
||||||
|
|
||||||
unknown = { };
|
unknown = { };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,6 @@ let
|
||||||
|
|
||||||
# cross packagesets
|
# cross packagesets
|
||||||
pkgsLLVM = true;
|
pkgsLLVM = true;
|
||||||
pkgsLLVMLibc = true;
|
|
||||||
pkgsMusl = true;
|
pkgsMusl = true;
|
||||||
pkgsStatic = true;
|
pkgsStatic = true;
|
||||||
pkgsCross = true;
|
pkgsCross = true;
|
||||||
|
|
|
@ -382,10 +382,6 @@ let
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
];
|
];
|
||||||
pkgsLLVMLibc.stdenv = [
|
|
||||||
"x86_64-linux"
|
|
||||||
"aarch64-linux"
|
|
||||||
];
|
|
||||||
pkgsArocc.stdenv = [
|
pkgsArocc.stdenv = [
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
|
|
|
@ -115,15 +115,6 @@ let
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
makeLLVMParsedPlatform =
|
|
||||||
parsed:
|
|
||||||
(
|
|
||||||
parsed
|
|
||||||
// {
|
|
||||||
abi = lib.systems.parse.abis.llvm;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
stdenvAdapters =
|
stdenvAdapters =
|
||||||
self: super:
|
self: super:
|
||||||
let
|
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 {
|
pkgsArocc = nixpkgsFun {
|
||||||
overlays = [
|
overlays = [
|
||||||
(self': super': {
|
(self': super': {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue