JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I forgot to undo a gcc46 unneeded change.

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2012-12-23 20:14:13 +01:00
parent 164a84f8f4
commit 6c9002639d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -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;