diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-06-18 19:30:25 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-06-18 19:30:25 (EDT) |
| commit | c214c727f60b070aa502b20dcc1ad7e3ce8579f2 (patch) | |
| tree | 6fdedba475ec57491e0f81bfe9355194327b7417 /src | |
| parent | 9196325df8ffa9107d9b87353635df4a4a0f1a51 (diff) | |
oh-shlibdeps: Hardcode lib dirs, drop ldconfig
Diffstat (limited to 'src')
| -rw-r--r-- | src/oh-shlibdeps.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/oh-shlibdeps.sh b/src/oh-shlibdeps.sh index 86ff114..910b194 100644 --- a/src/oh-shlibdeps.sh +++ b/src/oh-shlibdeps.sh @@ -31,8 +31,11 @@ find_lib() local pkg= local dir= - rtld_dirs="$(@LDCONFIG@ -v 2>/dev/null | \ - sed -n 's/^\([^\t].*\):$/\1/p')" + if [ '@multiarch_libdir@' = 'yes' ]; then + rtld_dirs="/lib/${OPK_HOST_ARCH} /usr/lib/${OPK_HOST_ARCH}" + else + rtld_dirs='/lib /usr/lib' + fi # Check just-built packages. for pkg in *.data/; do |