android: Use NDK 17 for aarch32
This commit is contained in:
parent
fc048073e6
commit
cf09ffe9aa
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue