androidndk: Fix usage as crossSystem

2018-05-17 17:22:27 +02:00
parent c056694d74
commit 832a8ca087
5 changed files with 35 additions and 8 deletions
@@ -41,7 +41,9 @@ in lib.init bootStages ++ [
      targetPlatform = crossSystem;
      cc = if crossSystem.useiOSPrebuilt or false
             then buildPackages.darwin.iosSdkPkgs.clang
-           else if crossSystem.useAndroidPrebuilt
+           else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit)
+             then buildPackages.androidenv.androidndkPkgs_10e.gcc
+           else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit)
             then buildPackages.androidenv.androidndkPkgs.gcc
           else buildPackages.gcc;
    };