mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 22:51:22 +00:00
I forgot to undo a gcc46 unneeded change.
This commit is contained in:
parent
164a84f8f4
commit
6c9002639d
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user