diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-10 21:55:16 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-26 22:00:15 +0000 |
| commit | 9fdd9d51bd183bf5deeb26dd3490590b7022674e (patch) | |
| tree | b71c80e5dcec3b2fb54c9bfd8b2a8475a6a7a9a0 /pkgs/development/compilers | |
| parent | b520b4aeee76e345916c87f01d1d9f4dbc78688e (diff) | |
| download | nixlib-9fdd9d51bd183bf5deeb26dd3490590b7022674e.tar nixlib-9fdd9d51bd183bf5deeb26dd3490590b7022674e.tar.gz nixlib-9fdd9d51bd183bf5deeb26dd3490590b7022674e.tar.bz2 nixlib-9fdd9d51bd183bf5deeb26dd3490590b7022674e.tar.lz nixlib-9fdd9d51bd183bf5deeb26dd3490590b7022674e.tar.xz nixlib-9fdd9d51bd183bf5deeb26dd3490590b7022674e.tar.zst nixlib-9fdd9d51bd183bf5deeb26dd3490590b7022674e.zip | |
Setting some kind of cross-compiler situation, for armv6l gnueabihf.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/builder.sh | 14 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index b596e0edbd7f..e6e7542b6ac6 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/builder.sh @@ -248,12 +248,12 @@ postInstall() { } -if test -z "$targetConfig" && test -z "$crossConfig"; then - if test -z "$profiledCompiler"; then - buildFlags="bootstrap $buildFlags" - else - buildFlags="profiledbootstrap $buildFlags" - fi -fi +#if test -z "$targetConfig" && test -z "$crossConfig"; then +# if test -z "$profiledCompiler"; then +# buildFlags="bootstrap $buildFlags" +# else +# buildFlags="profiledbootstrap $buildFlags" +# fi +#fi genericBuild diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index bcdde3ec8701..52cc1f9ec94f 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -295,7 +295,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" else ""); + "--with-arch=armv6 --with-fpu=vfp --with-float=hard --with-mode=arm --build=armv6l-linux-gnueabi --host=armv6l-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; |