diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-07 16:26:38 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-26 22:00:07 +0000 |
| commit | 43fc5ae7cf38932d5b1f6962abfcfc03491a124c (patch) | |
| tree | 7848a7dfffba566c57745139e1c27962d331d0e5 /pkgs/development/compilers | |
| parent | 32c061146de6a5241cea9d710457f5c04040d3ae (diff) | |
| download | nixlib-43fc5ae7cf38932d5b1f6962abfcfc03491a124c.tar nixlib-43fc5ae7cf38932d5b1f6962abfcfc03491a124c.tar.gz nixlib-43fc5ae7cf38932d5b1f6962abfcfc03491a124c.tar.bz2 nixlib-43fc5ae7cf38932d5b1f6962abfcfc03491a124c.tar.lz nixlib-43fc5ae7cf38932d5b1f6962abfcfc03491a124c.tar.xz nixlib-43fc5ae7cf38932d5b1f6962abfcfc03491a124c.tar.zst nixlib-43fc5ae7cf38932d5b1f6962abfcfc03491a124c.zip | |
Trying to fix the gcc builder; I added pi flags in the wrong if/else branch.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/builder.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index f4b3758c7c13..5012c76650f4 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/builder.sh @@ -75,7 +75,11 @@ if test "$noSysDirs" = "1"; then fi else if test -z "$NIX_GCC_CROSS"; then - EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" + 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_LDFLAGS="$EXTRA_LDFLAGS" else # 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" extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" - extraFlags="-mcpu=armv6 -mfpu=vfp -mhard-float -marm $extraFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" EXTRA_TARGET_CFLAGS="$extraFlags" |