Removing any cross-building kind of native build for the pi.

This commit is contained in:
Lluís Batlle i Rossell 2012-12-22 16:29:17 +00:00
parent 5b975f3c90
commit 2194b98565
2 changed files with 2 additions and 6 deletions

View file

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

View file

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