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/mobile | |
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/mobile')
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index f0557390988d..663a1f1ee8f4 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -15,12 +15,12 @@ let "x86_64-unknown-linux-gnu" = { double = "linux-x86_64"; }; - "armv5tel-unknown-linux-androideabi" = { + "armv5tel-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; gccVer = "4.8"; }; - "armv7a-unknown-linux-androideabi" = { + "armv7a-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; gccVer = "4.8"; @@ -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}") ]; |