From 17989028b0e592347ccd6246895128eeea613db6 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 3 Feb 2017 09:46:28 -0800 Subject: [PATCH] Tools: Fix recurring multiple times over the same library in deploy-mac.py --- Tools/deploy-mac.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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])