diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-20 20:08:11 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-26 22:00:20 +0000 |
| commit | fc51895afecc50327353f273351f8c46f88433a2 (patch) | |
| tree | ca598081242e964a46c5283ee648f2608a56d9c7 /pkgs/development/compilers/gcc | |
| parent | 9fdd9d51bd183bf5deeb26dd3490590b7022674e (diff) | |
| download | nixpkgs-fc51895afecc50327353f273351f8c46f88433a2.tar nixpkgs-fc51895afecc50327353f273351f8c46f88433a2.tar.gz nixpkgs-fc51895afecc50327353f273351f8c46f88433a2.tar.bz2 nixpkgs-fc51895afecc50327353f273351f8c46f88433a2.tar.lz nixpkgs-fc51895afecc50327353f273351f8c46f88433a2.tar.xz nixpkgs-fc51895afecc50327353f273351f8c46f88433a2.tar.zst nixpkgs-fc51895afecc50327353f273351f8c46f88433a2.zip | |
Get gccs understand 'fpu'
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.7/default.nix | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 52cc1f9ec94..38773fba973 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -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" + diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 60ef44f2a90..0d24f19e3c3 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -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" + |