Author: urkud
Date: Thu Mar 1 07:16:34 2012
New Revision: 32714
URL: https://nixos.org/websvn/nix/?rev=32714&sc=1
Log:
Fix wrong merge
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Mar
1 07:04:39 2012 (r32713)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Mar
1 07:16:34 2012 (r32714)
@@ -1900,9 +1900,6 @@
gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
inherit noSysDirs;
- cross = null;
- libcCross = null;
- binutilsCross = null;
# bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
