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

Get gccs understand 'fpu'

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2012-12-20 20:08:11 +01:00
parent 9fdd9d51bd
commit fc51895afe
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,9 +91,11 @@ let version = "4.6.3";
gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
gccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null cross;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
crossMingw = (cross != null && cross.libc == "msvcrt");
crossConfigureFlags =
@ -101,6 +103,7 @@ let version = "4.6.3";
withArch +
withCpu +
withAbi +
withFpu +
(if (crossMingw && crossStageStatic) then
" --with-headers=${libcCross}/include" +
" --with-gcc" +

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

@ -89,9 +89,11 @@ let version = "4.7.2";
gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
gccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null cross;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
crossMingw = (cross != null && cross.libc == "msvcrt");
crossConfigureFlags =
@ -99,6 +101,7 @@ let version = "4.7.2";
withArch +
withCpu +
withAbi +
withFpu +
(if (crossMingw && crossStageStatic) then
" --with-headers=${libcCross}/include" +
" --with-gcc" +