Merge pull request #117591 from s1341/android_non_prebuilt

treewide: Support aarch64-android using minimal prebuilt components
2021-05-11 12:49:53 -04:00
parent 032a1e4478 1e1d29c2af
commit 912c8262b4
8 changed files with 222 additions and 12 deletions
@@ -493,6 +493,10 @@ stdenv.mkDerivation {
        echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
    ''

+    + optionalString targetPlatform.isAndroid ''
+      echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags
+    ''
+
    # There are a few tools (to name one libstdcxx5) which do not work
    # well with multi line flags, so make the flags single line again
    + ''