Merge pull request #59743 from obsidiansystems/km-remove-androidndk-mfloat-flag

androidndk-pkgs: Remove -mfloat flag
2019-04-16 17:56:46 -04:00
parent b3bcdf8cf5 ec7643047c
commit d96a566cd5
2 changed files with 0 additions and 2 deletions
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -258,7 +258,6 @@ rec {
    name = "armeabi-v7a";
    gcc = {
      arch = "armv7-a";
-      float = "hard";
      float-abi = "softfp";
      fpu = "vfpv3-d16";
    };
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -99,7 +99,6 @@ rec {
          (lib.optional (p ? cpu) "-mcpu=${p.cpu}")
          (lib.optional (p ? abi) "-mabi=${p.abi}")
          (lib.optional (p ? fpu) "-mfpu=${p.fpu}")
-          (lib.optional (p ? float) "-mfloat=${p.float}")
          (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}")
          (lib.optional (p ? mode) "-mmode=${p.mode}")
        ];