diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-10 01:23:02 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-10 01:30:34 -0400 |
| commit | 589c2c2870340c21b799795f6ed3b09608676499 (patch) | |
| tree | 60ce4bb6f5f57c8f0466f2bb6f4b46588340a9a0 /pkgs/stdenv | |
| parent | f2bb67c8067e40d58630d628607674826fc98735 (diff) | |
| download | nixpkgs-589c2c2870340c21b799795f6ed3b09608676499.tar nixpkgs-589c2c2870340c21b799795f6ed3b09608676499.tar.gz nixpkgs-589c2c2870340c21b799795f6ed3b09608676499.tar.bz2 nixpkgs-589c2c2870340c21b799795f6ed3b09608676499.tar.lz nixpkgs-589c2c2870340c21b799795f6ed3b09608676499.tar.xz nixpkgs-589c2c2870340c21b799795f6ed3b09608676499.tar.zst nixpkgs-589c2c2870340c21b799795f6ed3b09608676499.zip | |
androidndk: fixup mess
New android ndk (18) now uses clang. We were going through the wrapper that are provided. This lead to surprising errors when building. Ideally we could use the llvm linker as well, but this leads to errors as many packages don’t support the llvm linker.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 7b4f8adc82f..43198f4e913 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -53,7 +53,7 @@ in lib.init bootStages ++ [ cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false - then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc + then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang else if crossSystem.useLLVM or false then buildPackages.llvmPackages_7.lldClang else buildPackages.gcc; |