diff options
| author | John Ericson <git@JohnEricson.me> | 2021-05-11 12:49:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 12:49:53 -0400 |
| commit | 912c8262b42aba8eba0914d72a924ae32e06034e (patch) | |
| tree | a2847bb47771e5262587a30275f52685d1086636 /pkgs/build-support/cc-wrapper | |
| parent | 032a1e44788bed0d752c1893996a5403f0df0d07 (diff) | |
| parent | 1e1d29c2af646b21c04f7a27614317a19ee01bc5 (diff) | |
| download | nixpkgs-912c8262b42aba8eba0914d72a924ae32e06034e.tar nixpkgs-912c8262b42aba8eba0914d72a924ae32e06034e.tar.gz nixpkgs-912c8262b42aba8eba0914d72a924ae32e06034e.tar.bz2 nixpkgs-912c8262b42aba8eba0914d72a924ae32e06034e.tar.lz nixpkgs-912c8262b42aba8eba0914d72a924ae32e06034e.tar.xz nixpkgs-912c8262b42aba8eba0914d72a924ae32e06034e.tar.zst nixpkgs-912c8262b42aba8eba0914d72a924ae32e06034e.zip | |
Merge pull request #117591 from s1341/android_non_prebuilt
treewide: Support aarch64-android using minimal prebuilt components
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 10085b91a13..d2941b537b7 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -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 + '' |