mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-14 00:22:44 +03:00
androidenv: fix NDK toolchain linking issues
Fixes #298285, alternative to #300386. As suggested in #298285 `lib64` was renamed to `lib`, so just doing the same as for `lib64` seems to fix the issue. See also recent discussion in #300386.
This commit is contained in:
parent
26c9d4cc48
commit
de0fdc1c78
@ -24,7 +24,11 @@ deployAndroidPackage rec {
|
|||||||
addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64
|
addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find toolchains -type d -name bin -or -name lib64 | while read dir; do
|
if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib ]; then
|
||||||
|
addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib
|
||||||
|
fi
|
||||||
|
|
||||||
|
find toolchains -type d -name bin -or -name lib64 -or -name lib | while read dir; do
|
||||||
autoPatchelf "$dir"
|
autoPatchelf "$dir"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user