mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 07:00:43 +00:00
Setting some kind of cross-compiler situation, for armv6l gnueabihf.
This commit is contained in:
parent
b520b4aeee
commit
9fdd9d51bd
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue