public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56219 from Ericson2314/more-stdenvNoLibs

Browse Source 
gccStdenvNoLibs, clangStdenvNoLibs: Init; libgcc: Use gccStdenvNoLibs
This commit is contained in:
John Ericson 2019-02-22 17:32:09 -05:00 committed by GitHub
commit f6d6daa82b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/top-level/all-packages.nix
View File

@ -35,7 +35,7 @@ in
stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; }; stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; };
stdenvNoLibs = let mkStdenvNoLibs = stdenv: let
bintools = stdenv.cc.bintools.override { bintools = stdenv.cc.bintools.override {
libc = null; libc = null;
noLibc = true; noLibc = true;
@ -51,6 +51,11 @@ in
lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null); lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null);
}; };
stdenvNoLibs = mkStdenvNoLibs stdenv;
gccStdenvNoLibs = mkStdenvNoLibs gccStdenv;
clangStdenvNoLibs = mkStdenvNoLibs clangStdenv;
# For convenience, allow callers to get the path to Nixpkgs. # For convenience, allow callers to get the path to Nixpkgs.
path = ../..; path = ../..;
@ -8553,7 +8558,9 @@ in
librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { };
libgcc = callPackage ../development/libraries/gcc/libgcc { }; libgcc = callPackage ../development/libraries/gcc/libgcc {
stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems
};
libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };