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

Setting some kind of cross-compiler situation, for armv6l gnueabihf.

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2012-12-10 21:55:16 +00:00
parent b520b4aeee
commit 9fdd9d51bd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,12 +248,12 @@ postInstall() {
} }
if test -z "$targetConfig" && test -z "$crossConfig"; then #if test -z "$targetConfig" && test -z "$crossConfig"; then
if test -z "$profiledCompiler"; then # if test -z "$profiledCompiler"; then
buildFlags="bootstrap $buildFlags" # buildFlags="bootstrap $buildFlags"
else # else
buildFlags="profiledbootstrap $buildFlags" # buildFlags="profiledbootstrap $buildFlags"
fi # fi
fi #fi
genericBuild genericBuild

2
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -295,7 +295,7 @@ stdenv.mkDerivation ({
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""} ${if cross != null then crossConfigureFlags else ""}
" + (if (cross == null && stdenv.platform.name == "raspberrypi") then " + (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 # ^ 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; targetConfig = if (cross != null) then cross.config else null;