summaryrefslogtreecommitdiffstats
path: root/build/osx/OSConsX.py
diff options
context:
space:
mode:
authorRJ Skerry-Ryan <rryan@mixxx.org>2018-09-26 21:57:06 -0700
committerRJ Skerry-Ryan <rryan@mixxx.org>2018-09-29 12:14:18 -0700
commit7c2d39243d3d416207b0e17e2745bbb96cb17e4b (patch)
tree0042cd7892f06d36964c4556a9818c30bcddc914 /build/osx/OSConsX.py
parent5ba6519a7d2ec70228a3958cf1c626b65d2c66c4 (diff)
Prefix otool_local_paths with the rpaths in the Mixxx binary when scanning its dependencies.
Diffstat (limited to 'build/osx/OSConsX.py')
-rw-r--r--build/osx/OSConsX.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/osx/OSConsX.py b/build/osx/OSConsX.py
index bf3584aa31..6b1d96d020 100644
--- a/build/osx/OSConsX.py
+++ b/build/osx/OSConsX.py
@@ -246,6 +246,8 @@ def build_app(target, source, env):
locals = {} # [ref] => (absolute_path, embedded_path) (ref is the original reference from looking at otool -L; we use this to decide if two libs are the same)
#XXX it would be handy if embed_dependencies returned the otool list for each ref it reads..
+ binary_rpaths = otool.rpaths(str(binary))
+ otool_local_paths = binary_rpaths + otool_local_paths
for ref, path in otool.embed_dependencies(str(binary), LOCAL=otool_local_paths, SYSTEM=otool_system_paths):
locals[ref] = (path, embed_lib(path))