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
This commit is contained in:
parent
20d16d92a6
commit
dfa2895181
@ -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
|
||||
'';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user