public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trying to fix the gcc builder; I added pi flags in the wrong if/else branch.

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2012-12-07 16:26:38 +00:00
parent 32c061146d
commit 43fc5ae7cf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/gcc/4.6/builder.sh
View File

@ -75,7 +75,11 @@ if test "$noSysDirs" = "1"; then
fi fi
else else
if test -z "$NIX_GCC_CROSS"; then 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" EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"
fi
EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS"
else else
# This the case of cross-building the gcc. # This the case of cross-building the gcc.
@ -97,7 +101,6 @@ if test "$noSysDirs" = "1"; then
glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib"
extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags"
extraFlags="-mcpu=armv6 -mfpu=vfp -mhard-float -marm $extraFlags"
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
EXTRA_TARGET_CFLAGS="$extraFlags" EXTRA_TARGET_CFLAGS="$extraFlags"