From 2194b98565d644a5a255f5498e3b392e27e1ae3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 22 Dec 2012 16:29:17 +0000 Subject: [PATCH] Removing any cross-building kind of native build for the pi. --- pkgs/development/compilers/gcc/4.6/builder.sh | 6 +----- 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;