From 84fadc8236e5369fb47fdc194acb97175b3d61bb Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 6 Nov 2013 18:28:02 -0800 Subject: [PATCH] fix(check_deps): Fix support for includes in ld.so.conf The path passed to _ReadLdSoConf must start with a '/' which wasn't happening since relpath returns a relative path. --- build_library/check_deps | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_library/check_deps b/build_library/check_deps index 9907b9093e..47257855f5 100755 --- a/build_library/check_deps +++ b/build_library/check_deps @@ -47,7 +47,8 @@ class CheckDependencies(object): # Includes are absolute or relative to the file itself. line = os.path.join(os.path.dirname(path), line[8:]) for p in glob.glob(self._root + line): - libdirs.extend(self._ReadLdSoConf(os.path.relpath(p, self._root))) + rel_p = "/%s" % os.path.relpath(p, self._root) + libdirs.extend(self._ReadLdSoConf(rel_p)) f.close()