diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-05-19 21:32:19 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-05-19 21:32:19 +0000 |
| commit | 63abc2ed86acfc39022d7674ccee66663a3451b8 (patch) | |
| tree | 6d3d52654151f88d00b2b9de4fc74aeee88d78c4 /pkgs/top-level/all-packages.nix | |
| parent | 91e31476227c8783b616b3f72e8ad94f3c55aab4 (diff) | |
| download | nixlib-63abc2ed86acfc39022d7674ccee66663a3451b8.tar nixlib-63abc2ed86acfc39022d7674ccee66663a3451b8.tar.gz nixlib-63abc2ed86acfc39022d7674ccee66663a3451b8.tar.bz2 nixlib-63abc2ed86acfc39022d7674ccee66663a3451b8.tar.lz nixlib-63abc2ed86acfc39022d7674ccee66663a3451b8.tar.xz nixlib-63abc2ed86acfc39022d7674ccee66663a3451b8.tar.zst nixlib-63abc2ed86acfc39022d7674ccee66663a3451b8.zip | |
GCC 4.5: Add support for a separate libpthread; rearrange target flags handling.
svn path=/nixpkgs/trunk/; revision=21905
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61da353a7c7a..0d87a3c09877 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2103,7 +2103,13 @@ let }; gccCrossStageFinal = wrapGCCCross { - gcc = forceBuildDrv gcc_realCross; + gcc = forceBuildDrv (gcc_realCross.override { + libpthreadCross = + # FIXME: Don't explicitly refer to `i586-pc-gnu'. + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then hurdLibpthreadCross + else null; + }); libc = libcCross; binutils = binutilsCross; cross = assert crossSystem != null; crossSystem; |