diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-22 16:29:17 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-26 22:00:29 +0000 |
| commit | 2194b98565d644a5a255f5498e3b392e27e1ae3d (patch) | |
| tree | 0b8031fb47398bf5f5097f80d8ccadccd20304e6 /pkgs/development/compilers/gcc | |
| parent | 5b975f3c90e541bd807e825a45d693f769b7b027 (diff) | |
| download | nixpkgs-2194b98565d644a5a255f5498e3b392e27e1ae3d.tar nixpkgs-2194b98565d644a5a255f5498e3b392e27e1ae3d.tar.gz nixpkgs-2194b98565d644a5a255f5498e3b392e27e1ae3d.tar.bz2 nixpkgs-2194b98565d644a5a255f5498e3b392e27e1ae3d.tar.lz nixpkgs-2194b98565d644a5a255f5498e3b392e27e1ae3d.tar.xz nixpkgs-2194b98565d644a5a255f5498e3b392e27e1ae3d.tar.zst nixpkgs-2194b98565d644a5a255f5498e3b392e27e1ae3d.zip | |
Removing any cross-building kind of native build for the pi.
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index e6e7542b6ac..fbfe86a7b31 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/builder.sh @@ -75,11 +75,7 @@ if test "$noSysDirs" = "1"; then fi else if test -z "$NIX_GCC_CROSS"; then - if [ $system == "armv6l-linux" ]; then - EXTRA_TARGET_CFLAGS="-mcpu=armv6 -mfpu=vfp -mhard-float -marm $EXTRA_FLAGS" - else - EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" - fi + EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" else # This the case of cross-building the gcc. diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 38773fba973..a504eb96a8b 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -298,7 +298,7 @@ stdenv.mkDerivation ({ ${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=armv6l-linux-gnueabi --host=armv6l-linux-gnueabihf" else ""); + "--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; |