From f2004e62870aa6b21dd52612295da973194c7c73 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 12 May 2018 15:07:31 -0400 Subject: lib: Fix float handling for Aarch32 Forgot to adjust default so abi with explicit float attr would be used. --- pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/mobile') diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 1413e35e904a..663a1f1ee8f4 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -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}") ]; -- cgit 1.4.1