diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-01 15:20:13 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-01 15:20:13 +0000 |
| commit | fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc (patch) | |
| tree | e35bc635a581c07faf09985f04871a9a8abf8a5c /pkgs | |
| parent | 03fc55deeb272a4f24ba10ce6ac3fa58f13248a1 (diff) | |
| download | nixpkgs-fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc.tar nixpkgs-fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc.tar.gz nixpkgs-fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc.tar.bz2 nixpkgs-fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc.tar.lz nixpkgs-fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc.tar.xz nixpkgs-fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc.tar.zst nixpkgs-fe75d617b2466f9b6bc8e0d0f6920a351ffbdefc.zip | |
Setting gcc 4.3.4 as the default cross-gcc, and fixing glibc-2.10 for cross
building with it. svn path=/nixpkgs/branches/stdenv-updates/; revision=18736
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glibc-2.10/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc-2.10/default.nix b/pkgs/development/libraries/glibc-2.10/default.nix index f65f8b6b49f..49ee71af506 100644 --- a/pkgs/development/libraries/glibc-2.10/default.nix +++ b/pkgs/development/libraries/glibc-2.10/default.nix @@ -45,7 +45,7 @@ EOF export AR="$crossConfig-ar" export RANLIB="$crossConfig-ranlib" - dontStrip = 1 + dontStrip=1 ''; } else {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3435301ed5..aa41f8c4361 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1801,7 +1801,7 @@ let }; gccCrossStageStatic = cross: wrapGCCCross { - gcc = forceBuildDrv ((gcc44_realCross cross).override { + gcc = forceBuildDrv ((gcc43_realCross cross).override { crossStageStatic = true; langCC = false; glibcCross = null; @@ -1812,7 +1812,7 @@ let }; gccCrossStageFinal = cross: wrapGCCCross { - gcc = forceBuildDrv (gcc44_realCross cross); + gcc = forceBuildDrv (gcc43_realCross cross); libc = glibcCross cross; binutils = binutilsCross cross; inherit cross; |