diff options
author | root <root@raspberrypi.(none)> | 2012-12-06 15:51:52 +0000 |
---|---|---|
committer | LluĂs Batlle i Rossell <viric@viric.name> | 2012-12-26 21:59:54 +0000 |
commit | 1b29d29c7610402cb278130f12b27900bb5a99f0 (patch) | |
tree | 7a731c60aafd237f5218bc227564b86dfbba7e78 /pkgs/development/compilers/gcc | |
parent | 1af2ada7d4c61e79356a0f3f8bcced6159a6e751 (diff) | |
download | nixpkgs-1b29d29c7610402cb278130f12b27900bb5a99f0.tar nixpkgs-1b29d29c7610402cb278130f12b27900bb5a99f0.tar.gz nixpkgs-1b29d29c7610402cb278130f12b27900bb5a99f0.tar.bz2 nixpkgs-1b29d29c7610402cb278130f12b27900bb5a99f0.tar.lz nixpkgs-1b29d29c7610402cb278130f12b27900bb5a99f0.tar.xz nixpkgs-1b29d29c7610402cb278130f12b27900bb5a99f0.tar.zst nixpkgs-1b29d29c7610402cb278130f12b27900bb5a99f0.zip |
First movement to get the raspberrypi stdenv building.
Diffstat (limited to 'pkgs/development/compilers/gcc')
-rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index e27f1a47f9c..bcdde3ec870 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -294,7 +294,9 @@ 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" 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; |