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

gcc47: Fixing the gcc.float cross parameters

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2012-12-28 21:38:03 +01:00
parent d7fb4db241
commit 87ec7b49b1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ let version = "4.7.2";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
withFloat = if gccFpu != null then " --with-float=${gccFloat}" else ""; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
crossMingw = (cross != null && cross.libc == "msvcrt"); crossMingw = (cross != null && cross.libc == "msvcrt");
crossConfigureFlags = crossConfigureFlags =
@ -328,7 +328,7 @@ stdenv.mkDerivation ({
xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else ""; xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else ""; xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else ""; xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
xwithFloat = if xgccFpu != null then " --with-float=${xgccFloat}" else ""; xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
in { in {
AR = "${stdenv.cross.config}-ar"; AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld"; LD = "${stdenv.cross.config}-ld";
@ -373,6 +373,7 @@ stdenv.mkDerivation ({
${xwithCpu} ${xwithCpu}
${xwithAbi} ${xwithAbi}
${xwithFpu} ${xwithFpu}
${xwithFloat}
''; '';
buildFlags = ""; buildFlags = "";
}; };