mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 13:30:36 +00:00
minimal-bootstrap.gcc10: Use wrapper
This commit is contained in:
@@ -150,11 +150,21 @@ lib.makeScope
|
||||
gnutar = gnutar-musl;
|
||||
};
|
||||
|
||||
gcc10 = callPackage ./gcc/10.nix {
|
||||
gcc10-unwrapped = callPackage ./gcc/10.nix {
|
||||
gcc = gcc46-cxx;
|
||||
gnumake = gnumake-musl;
|
||||
gnutar = gnutar-latest;
|
||||
};
|
||||
gcc10 = callPackage ./gcc/wrapper.nix {
|
||||
gcc-unwrapped = gcc10-unwrapped;
|
||||
bash-build = bash;
|
||||
libc = musl;
|
||||
libgcc = gcc10-unwrapped;
|
||||
libstdcxx = gcc10-unwrapped;
|
||||
targetPlatform = hostPlatform;
|
||||
dynamicLinkerGlob = "${musl}/lib/libc.so";
|
||||
staticLibgcc = true;
|
||||
};
|
||||
|
||||
gcc-latest-unwrapped = callPackage ./gcc/latest.nix {
|
||||
gcc = gcc10;
|
||||
|
||||
Reference in New Issue
Block a user