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

gcc4.7: making the cross-built gcc respect withAbi, withArch, ...

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2012-12-24 16:37:54 +01:00
parent 5258c8a0c6
commit 96b0de4c33
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/compilers/gcc/4.7/default.nix
View File

@ -308,7 +308,16 @@ stdenv.mkDerivation ({
then "install-strip" then "install-strip"
else "install"; else "install";
crossAttrs = { crossAttrs = let
xgccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null stdenv.cross;
xgccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null stdenv.cross;
xgccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null stdenv.cross;
xgccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null stdenv.cross;
xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
in {
AR = "${stdenv.cross.config}-ar"; AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld"; LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc"; CC = "${stdenv.cross.config}-gcc";
@ -347,9 +356,11 @@ stdenv.mkDerivation ({
) )
} }
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
--target=${stdenv.cross.config} --target=${stdenv.cross.config}
${xwithArch}
${xwithCpu}
${xwithAbi}
${xwithFpu}
''; '';
}; };