Merge branch 'fix-gcc-with-float'

2 files changed, 8 insertions, 8 deletions

diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
index e261f54f582d..9a6d3f8f6203 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,13 +1,13 @@
 { lib, targetPlatform }:
 
 let
-  p = targetPlatform.platform.gcc or {};
-  float = p.float or (targetPlatform.parsed.abi.float or null);
+  p =  targetPlatform.platform.gcc or {}
+    // targetPlatform.parsed.abi;
 in lib.concatLists [
   (lib.optional (p ? arch) "--with-arch=${p.arch}")
   (lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
   (lib.optional (p ? abi) "--with-abi=${p.abi}")
   (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
-  (lib.optional (float != null) "--with-float=${float}")
+  (lib.optional (p ? float) "--with-float=${p.float}")
   (lib.optional (p ? mode) "--with-mode=${p.mode}")
 ]
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index f0557390988d..663a1f1ee8f4 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -15,12 +15,12 @@ let
     "x86_64-unknown-linux-gnu" = {
       double = "linux-x86_64";
     };
-   "armv5tel-unknown-linux-androideabi" = {
+    "armv5tel-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
       gccVer = "4.8";
     };
-   "armv7a-unknown-linux-androideabi" = {
+    "armv7a-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
       gccVer = "4.8";
@@ -65,14 +65,14 @@ rec {
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
     extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let
-        p = targetPlatform.platform.gcc or {};
-        float = p.float or (targetPlatform.parsed.abi.float or null);
+        p =  targetPlatform.platform.gcc or {}
+          // targetPlatform.parsed.abi;
         flags = lib.concatLists [
           (lib.optional (p ? arch) "-march=${p.arch}")
           (lib.optional (p ? cpu) "-mcpu=${p.cpu}")
           (lib.optional (p ? abi) "-mabi=${p.abi}")
           (lib.optional (p ? fpu) "-mfpu=${p.fpu}")
-          (lib.optional (float != null) "-mfloat=${float}")
+          (lib.optional (p ? float) "-mfloat=${p.float}")
           (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}")
           (lib.optional (p ? mode) "-mmode=${p.mode}")
         ];