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/compilers/gcc/common/platform-flags.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/compilers/gcc') 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}") ] -- cgit 1.4.1