diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-12 15:07:31 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-12 15:18:31 -0400 |
| commit | f2004e62870aa6b21dd52612295da973194c7c73 (patch) | |
| tree | 7dcc88f1907c1a880d82ab00ee154631bce23543 /pkgs/development/mobile/androidenv/androidndk-pkgs.nix | |
| parent | 6f40d18d4432858199e14d2323b4f8503ee47a7e (diff) | |
| download | nixpkgs-f2004e62870aa6b21dd52612295da973194c7c73.tar nixpkgs-f2004e62870aa6b21dd52612295da973194c7c73.tar.gz nixpkgs-f2004e62870aa6b21dd52612295da973194c7c73.tar.bz2 nixpkgs-f2004e62870aa6b21dd52612295da973194c7c73.tar.lz nixpkgs-f2004e62870aa6b21dd52612295da973194c7c73.tar.xz nixpkgs-f2004e62870aa6b21dd52612295da973194c7c73.tar.zst nixpkgs-f2004e62870aa6b21dd52612295da973194c7c73.zip | |
lib: Fix float handling for Aarch32
Forgot to adjust default so abi with explicit float attr would be used.
Diffstat (limited to 'pkgs/development/mobile/androidenv/androidndk-pkgs.nix')
| -rw-r--r-- | pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 1413e35e904..663a1f1ee8f 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}") ]; |