diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-13 18:38:40 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-13 20:31:33 -0400 |
| commit | dfa28951818189a983079bacbbc06d92a584e953 (patch) | |
| tree | 19a939f35644f8ab2009a6a8e210ca1a48f8a616 /pkgs/development/mobile | |
| parent | 20d16d92a6033ce084a8a7b47497d503fd405994 (diff) | |
| download | nixlib-dfa28951818189a983079bacbbc06d92a584e953.tar nixlib-dfa28951818189a983079bacbbc06d92a584e953.tar.gz nixlib-dfa28951818189a983079bacbbc06d92a584e953.tar.bz2 nixlib-dfa28951818189a983079bacbbc06d92a584e953.tar.lz nixlib-dfa28951818189a983079bacbbc06d92a584e953.tar.xz nixlib-dfa28951818189a983079bacbbc06d92a584e953.tar.zst nixlib-dfa28951818189a983079bacbbc06d92a584e953.zip | |
androidndk: fixup asm linking
This fixes cross compiling to android that is currently broken. The asm symlink needs to be set on versions /newer/ than 10e not the other way around. We also need to use hostInfo’s triple here because ... /cc @ericson2314 @bkchr
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/androidndk-pkgs.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 1323466ea865..9541d62e1601 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -110,7 +110,8 @@ rec { mkdir -p $out cp -r ${includePath} $out/include chmod +w $out/include - ${lib.optionalString (lib.versionOlder buildAndroidndk.version "10e") "ln -s $out/include/${targetInfo.triple}/asm $out/include/asm"} + ${lib.optionalString (lib.versionOlder "10e" buildAndroidndk.version) + "ln -s $out/include/${hostInfo.triple}/asm $out/include/asm"} ln -s ${libPath} $out/lib ''; } |