diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
| commit | 5b132f6e96a9794018ae1c085da482b381d1e039 (patch) | |
| tree | ff54ae514799540c093adcfeca0d501b75cde506 /pkgs/build-support/gcc-wrapper/default.nix | |
| parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
| parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) | |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/build-support/gcc-wrapper/default.nix')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index d3f957d18a2d8..f0062f8191ed1 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else if stdenv.system == "powerpc-linux" then "ld.so.1" else - if stdenv.system == "mips64-linux" then "ld.so.1" else + if stdenv.system == "mips64el-linux" then "ld.so.1" else abort "don't know the name of the dynamic linker for this platform") else ""; } |