mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 04:45:39 +00:00
Merge pull request #313255 from Philipp-M/androidenv-fix-ndk-toolchains
androidenv: fix NDK toolchain linking issues
This commit is contained in:
commit
ac82a513e5
@ -24,7 +24,11 @@ deployAndroidPackage rec {
|
||||
addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64
|
||||
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"
|
||||
done
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user