From 6c9002639dda6738ab9a4d18e62ebddcac4cddd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 23 Dec 2012 20:14:13 +0100 Subject: [PATCH] I forgot to undo a gcc46 unneeded change. --- pkgs/development/compilers/gcc/4.6/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index a504eb96a8b..ade35c3c2cf 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -297,9 +297,7 @@ stdenv.mkDerivation ({ ${if langAda then " --enable-libada" else ""} ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} - " + (if (cross == null && stdenv.platform.name == "raspberrypi") then - "--with-arch=armv6 --with-fpu=vfp --with-float=hard --with-mode=arm --build=arm-linux-gnueabi --host=arm-linux-gnueabihf" else ""); - # ^ This above is out of "" because we don't want to rebuild stdenv in other archs + "; targetConfig = if (cross != null) then cross.config else null;