diff options
| -rw-r--r-- | lib/systems/examples.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 4c7dd9917919..2d77a57fbe31 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -31,14 +31,14 @@ rec { armv5te-android-prebuilt = rec { config = "armv5tel-unknown-linux-androideabi"; - sdkVer = "21"; + sdkVer = "24"; platform = platforms.armv5te-android; useAndroidPrebuilt = true; }; armv7a-android-prebuilt = rec { config = "armv7a-unknown-linux-androideabi"; - sdkVer = "21"; + sdkVer = "24"; platform = platforms.armv7a-android; useAndroidPrebuilt = true; }; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 9541d62e1601..a0f684d37cc7 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -18,12 +18,12 @@ let "armv5tel-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; - gccVer = "4.8"; + gccVer = "4.9"; }; "armv7a-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; - gccVer = "4.8"; + gccVer = "4.9"; }; "aarch64-unknown-linux-android" = { arch = "arm64"; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 41b5fd99504d..973be9831861 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -41,9 +41,7 @@ in lib.init bootStages ++ [ targetPlatform = crossSystem; cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang - else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit) - then buildPackages.androidenv.androidndkPkgs_10e.gcc - else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit) + else if crossSystem.useAndroidPrebuilt then buildPackages.androidenv.androidndkPkgs.gcc else buildPackages.gcc; }; |