summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2012-12-28 21:38:03 +0100
committerLluís Batlle i Rossell <viric@viric.name>2012-12-28 21:38:57 +0100
commit87ec7b49b120950a260d9733de7f34d7c2bffb98 (patch)
tree89f50ad10211bbca2fcd723de7410a9d962fc0ad /pkgs/development/compilers
parentd7fb4db24193772e28ad30fe9bba8708a796dca5 (diff)
downloadnixlib-87ec7b49b120950a260d9733de7f34d7c2bffb98.tar
nixlib-87ec7b49b120950a260d9733de7f34d7c2bffb98.tar.gz
nixlib-87ec7b49b120950a260d9733de7f34d7c2bffb98.tar.bz2
nixlib-87ec7b49b120950a260d9733de7f34d7c2bffb98.tar.lz
nixlib-87ec7b49b120950a260d9733de7f34d7c2bffb98.tar.xz
nixlib-87ec7b49b120950a260d9733de7f34d7c2bffb98.tar.zst
nixlib-87ec7b49b120950a260d9733de7f34d7c2bffb98.zip
gcc47: Fixing the gcc.float cross parameters
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/gcc/4.7/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index ed1a977b6941..662f6192f9fb 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -95,7 +95,7 @@ let version = "4.7.2";
     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 "";
-    withFloat = if gccFpu != null then " --with-float=${gccFloat}" else "";
+    withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
     crossMingw = (cross != null && cross.libc == "msvcrt");
 
     crossConfigureFlags =
@@ -328,7 +328,7 @@ stdenv.mkDerivation ({
     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 "";
-    xwithFloat = if xgccFpu != null then " --with-float=${xgccFloat}" else "";
+    xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
   in {
     AR = "${stdenv.cross.config}-ar";
     LD = "${stdenv.cross.config}-ld";
@@ -373,6 +373,7 @@ stdenv.mkDerivation ({
       ${xwithCpu}
       ${xwithAbi}
       ${xwithFpu}
+      ${xwithFloat}
     '';
     buildFlags = "";
   };