Cleanup perl logic in stdenvLinux

Make thread disabling explicit.  This changes the semantics of the perl
derivation, so on other platforms it may require setting

  enableThreading = false

This commit doesn't change the derivation or out hash of stdenvLinux.
This commit is contained in:
Gergely Risko
2014-09-14 21:36:14 +02:00
parent fca5d864b6
commit c5df246ba9
3 changed files with 34 additions and 6 deletions
+6 -2
View File
@@ -169,8 +169,12 @@ rec {
binutils = pkgs.binutils.override { gold = false; };
inherit (stage0.pkgs) glibc;
# TODO(errge) This was accidentally like this historically, most probably not needed
perl = pkgs.perl.override { stdenv = stage1.stdenv.override { extraAttrs = { inherit platform; }; }; };
# A threaded perl build needs glibc/libpthread_nonshared.a,
# which is not included in bootstrapTools, so disable threading.
# This is not an issue for the final stdenv, because this perl
# won't be included in the final stdenv and won't be exported to
# top-level pkgs as an override either.
perl = pkgs.perl.override { enableThreading = false; };
};
};