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

GNU libc 2.14: Fix cross-GNU builds.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32367
This commit is contained in:
Ludovic Courtès
2012-02-17 20:37:31 +00:00
parent da3ecd1256
commit d4742ad714
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+6 -3
View File
@@ -3576,15 +3576,18 @@ let
in ({ in ({
inherit stdenv fetchurl; inherit stdenv fetchurl;
gccCross = gccCrossStageStatic; gccCross = gccCrossStageStatic;
kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross; kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross;
installLocales = getConfig [ "glibc" "locales" ] false; installLocales = getConfig [ "glibc" "locales" ] false;
} }
// //
(if crossGNU (if crossGNU
then { inherit machHeaders hurdHeaders mig fetchgit; } then {
else { })))); inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig;
inherit fetchgit;
}
else { })));
# We can choose: # We can choose:
libcCrossChooser = name : if (name == "glibc") then glibcCross libcCrossChooser = name : if (name == "glibc") then glibcCross