summaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorVicki Pfau <vi@endrift.com>2017-02-03 09:46:28 -0800
committerVicki Pfau <vi@endrift.com>2017-02-03 09:46:28 -0800
commit17989028b0e592347ccd6246895128eeea613db6 (patch)
treeccda53a8d60975ebb401c68f4824195c898b270f /Tools
parent2e2eabdfcbc283672ed1b1d6d30f65211179c155 (diff)
Tools: Fix recurring multiple times over the same library in deploy-mac.py
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/deploy-mac.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Tools/deploy-mac.py b/Tools/deploy-mac.py
index 328ad625cd..674b663525 100755
--- a/Tools/deploy-mac.py
+++ b/Tools/deploy-mac.py
@@ -96,6 +96,7 @@ def updateMachO(bin, execPath, root):
if os.access(newPath, os.F_OK):
if verbose:
print('Skipping copying {}, already done.'.format(oldPath))
+ newPath = None
elif os.path.abspath(oldPath) != os.path.abspath(newPath):
if verbose:
print('Copying {} to {}...'.format(oldPath, newPath))
@@ -111,7 +112,8 @@ def updateMachO(bin, execPath, root):
args = [installNameTool]
for path, oldExecPath, newExecPath in toUpdate:
if path != bin:
- updateMachO(path, execPath, root)
+ if path:
+ updateMachO(path, execPath, root)
if verbose:
print('Updating Mach-O load from {} to {}...'.format(oldExecPath, newExecPath))
args.extend(['-change', oldExecPath, newExecPath])