diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:38 +0300 |
| commit | 003473613a084b38a1f0335ba8035461b4190e5d (patch) | |
| tree | cc4598d81eb607acba0d89664fe13fd44138dd7e /pkgs/stdenv | |
| parent | 39696b6d56fbe93834a8997057b3507e8cd2a234 (diff) | |
| parent | 50bbc56b0bd87715bc17230365fe5eb441bfac68 (diff) | |
| download | nixpkgs-003473613a084b38a1f0335ba8035461b4190e5d.tar nixpkgs-003473613a084b38a1f0335ba8035461b4190e5d.tar.gz nixpkgs-003473613a084b38a1f0335ba8035461b4190e5d.tar.bz2 nixpkgs-003473613a084b38a1f0335ba8035461b4190e5d.tar.lz nixpkgs-003473613a084b38a1f0335ba8035461b4190e5d.tar.xz nixpkgs-003473613a084b38a1f0335ba8035461b4190e5d.tar.zst nixpkgs-003473613a084b38a1f0335ba8035461b4190e5d.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 973be983186..41b5fd99504 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -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; }; |