forked from mirrors/nixpkgs
GNU libc 2.14: Fix cross-GNU builds.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32367
This commit is contained in:
parent
da3ecd1256
commit
d4742ad714
|
@ -3576,15 +3576,18 @@ let
|
|||
in ({
|
||||
inherit stdenv fetchurl;
|
||||
gccCross = gccCrossStageStatic;
|
||||
kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross;
|
||||
kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross;
|
||||
installLocales = getConfig [ "glibc" "locales" ] false;
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
(if crossGNU
|
||||
then { inherit machHeaders hurdHeaders mig fetchgit; }
|
||||
else { }))));
|
||||
then {
|
||||
inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig;
|
||||
inherit fetchgit;
|
||||
}
|
||||
else { })));
|
||||
|
||||
# We can choose:
|
||||
libcCrossChooser = name : if (name == "glibc") then glibcCross
|
||||
|
|
Loading…
Reference in a new issue