diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-12-02 08:15:26 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-12-02 08:16:10 +0100 |
| commit | 13c43455a05b036002e79808ca1c8e0d91d7871b (patch) | |
| tree | 147ddbfc5486085018bb527de1a43961fc8ee1ca /support/scripts/check-host-rpath | |
| parent | 2e08c7398a47b414c288ea516514adac3edf00fb (diff) | |
| parent | 0393f5d34433e34e49ff7ce0fb998735453ed4fc (diff) | |
| download | buildroot-13c43455a05b036002e79808ca1c8e0d91d7871b.tar.gz buildroot-13c43455a05b036002e79808ca1c8e0d91d7871b.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support/scripts/check-host-rpath')
| -rwxr-xr-x | support/scripts/check-host-rpath | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/support/scripts/check-host-rpath b/support/scripts/check-host-rpath index 169628decb..6c5767da05 100755 --- a/support/scripts/check-host-rpath +++ b/support/scripts/check-host-rpath @@ -63,7 +63,8 @@ check_elf_has_rpath() { for dir in ${rpath//:/ }; do # Remove duplicate and trailing '/' for proper match dir="$( sed -r -e 's:/+:/:g; s:/$::;' <<<"${dir}" )" - [ "${dir}" = "${hostdir}/lib" -o "${dir}" = "\$ORIGIN/../lib" ] && return 0 + [ "${dir}" = "${hostdir}/lib" ] && return 0 + [ "${dir}" = "\$ORIGIN/../lib" ] && return 0 done done < <( readelf -d "${file}" \ |sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \ |
