diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-13 01:02:09 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-13 01:02:09 -0400 |
| commit | 2c5d915200aef1ea888fbe2957822ca76f99954e (patch) | |
| tree | f58999bdb3e0a37ab85e8135ed406e8ed8debfe2 /pkgs/development/compilers/gcc | |
| parent | 6ec7291a7984595559751b0570b858c7fcad4fc0 (diff) | |
| parent | 92b7a814f26ee1d37e989431c18518c67285a332 (diff) | |
| download | nixlib-2c5d915200aef1ea888fbe2957822ca76f99954e.tar nixlib-2c5d915200aef1ea888fbe2957822ca76f99954e.tar.gz nixlib-2c5d915200aef1ea888fbe2957822ca76f99954e.tar.bz2 nixlib-2c5d915200aef1ea888fbe2957822ca76f99954e.tar.lz nixlib-2c5d915200aef1ea888fbe2957822ca76f99954e.tar.xz nixlib-2c5d915200aef1ea888fbe2957822ca76f99954e.tar.zst nixlib-2c5d915200aef1ea888fbe2957822ca76f99954e.zip | |
Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/common/platform-flags.nix | 6 |
1 files changed, 3 insertions, 3 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}") ] |