diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-23 20:14:13 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-26 22:01:17 +0000 |
| commit | 6c9002639dda6738ab9a4d18e62ebddcac4cddd7 (patch) | |
| tree | 696f005d25b2c2e89a669e8109fe7787c603f488 /pkgs/development/compilers | |
| parent | 164a84f8f4bd41a24ab2d9dc39fd2537de50bd0a (diff) | |
| download | nixlib-6c9002639dda6738ab9a4d18e62ebddcac4cddd7.tar nixlib-6c9002639dda6738ab9a4d18e62ebddcac4cddd7.tar.gz nixlib-6c9002639dda6738ab9a4d18e62ebddcac4cddd7.tar.bz2 nixlib-6c9002639dda6738ab9a4d18e62ebddcac4cddd7.tar.lz nixlib-6c9002639dda6738ab9a4d18e62ebddcac4cddd7.tar.xz nixlib-6c9002639dda6738ab9a4d18e62ebddcac4cddd7.tar.zst nixlib-6c9002639dda6738ab9a4d18e62ebddcac4cddd7.zip | |
I forgot to undo a gcc46 unneeded change.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index a504eb96a8b7..ade35c3c2cf1 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; |