[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects

[Michael Stahl]

 bin/check-elf-dynamic-objects |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 207c9a8f25dd705502608fbf82b4915cd6b62998
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 11 19:33:26 2016 +0200

    check-elf-dynamic-objects: check sdk/bin too
    
    It takes almost no time, but this way of doing it changes the
    interpretation of the -d parameter; not sure how important that is.
    
    Change-Id: I9d29cdf96d7006d5daea00bcc41e613fbd30aac8
    Reviewed-on: https://gerrit.libreoffice.org/29707
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 32cff57..f05d513 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -13,7 +13,7 @@
 set -euo pipefail
 
 PARA=1
-check_path="${INSTDIR:-.}/program"
+check_path="${INSTDIR:-.}"
 
 while [ "${1:-}" != "" ]; do
     parm=${1%%=*}
@@ -56,7 +56,7 @@ while [ "${1:-}" != "" ]; do
 done
 
 
-files=$(find "${check_path}" -type f)
+files=$(find "${check_path}/program" "${check_path}/sdk/bin" -type f)
 # all RPATHs should point to ${INSTDIR}/program so that's the files they find
 programfiles=$(basename -a $(echo ${files} | grep -o '/program/[^/]* '))