JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

androidndk: fixup asm linking

Browse Source 
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
This commit is contained in:
Matthew Bauer 2018-06-13 18:38:40 -04:00
parent 20d16d92a6
commit dfa2895181
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/mobile/androidenv/androidndk-pkgs.nix
View File

@ -110,7 +110,8 @@ rec {
mkdir -p $out mkdir -p $out
cp -r ${includePath} $out/include cp -r ${includePath} $out/include
chmod +w $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 ln -s ${libPath} $out/lib
''; '';
} }