From 127416ae93c1f1c2646b20a31f72cd7c3de18e20 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Fri, 7 Dec 2012 13:32:49 -0800 Subject: [PATCH] check_deps: Find libraries using RUNPATH too, not just RPATH check_deps checks for libraries using RPATH, but does not take the similar RUNPATH into account. For the purposes of chasing down library dependencies, finding a library on either path suffices. BUG=None TEST=Build an image that includes binaries and associated libraries in a non-standard location, with the binaries and libraries setting an RUNPATH (and not an RPATH) pointing at that non-standard location. Change-Id: Ic930bbacbe5c8ddeb367c39960dadea8aaba0cb2 Reviewed-on: https://gerrit.chromium.org/gerrit/39397 Tested-by: Josh Triplett Reviewed-by: Mike Frysinger Commit-Ready: Josh Triplett --- build_library/check_deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/check_deps b/build_library/check_deps index 54e25b2483..9907b9093e 100755 --- a/build_library/check_deps +++ b/build_library/check_deps @@ -10,7 +10,7 @@ import sys import glob _SHARED_RE = re.compile(r"Shared library: \[([^\]]+)\]") -_RPATH_RE = re.compile(r"Library rpath: \[([^\]]+)\]") +_RPATH_RE = re.compile(r"Library r(?:un)?path: \[([^\]]+)\]") class CheckDependencies(object):