diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-12 15:21:30 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-12 15:21:30 -0400 |
| commit | 92b7a814f26ee1d37e989431c18518c67285a332 (patch) | |
| tree | 3abff63217cd5e7b80cf3384e6226175780b22b5 /pkgs/development/compilers/gcc | |
| parent | b0d29e7e179f20c92f18e2eff13b871d015adc5a (diff) | |
| parent | f2004e62870aa6b21dd52612295da973194c7c73 (diff) | |
| download | nixlib-92b7a814f26ee1d37e989431c18518c67285a332.tar nixlib-92b7a814f26ee1d37e989431c18518c67285a332.tar.gz nixlib-92b7a814f26ee1d37e989431c18518c67285a332.tar.bz2 nixlib-92b7a814f26ee1d37e989431c18518c67285a332.tar.lz nixlib-92b7a814f26ee1d37e989431c18518c67285a332.tar.xz nixlib-92b7a814f26ee1d37e989431c18518c67285a332.tar.zst nixlib-92b7a814f26ee1d37e989431c18518c67285a332.zip | |
Merge branch 'fix-gcc-with-float'
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}") ] |