ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4815 from endrift/forward-port-deploy-mac 

Tools: Fix recurring multiple times over the same library in deploy-mac.py
This commit is contained in:
Matthew Parlane 2017-02-04 10:08:06 +13:00 committed by GitHub
parent 87c73cbeb3 17989028b0
commit 6821733053
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/deploy-mac.py
View File

@ -96,6 +96,7 @@ def updateMachO(bin, execPath, root):
if os.access(newPath, os.F_OK): if os.access(newPath, os.F_OK):
if verbose: if verbose:
print('Skipping copying {}, already done.'.format(oldPath)) print('Skipping copying {}, already done.'.format(oldPath))
newPath = None
elif os.path.abspath(oldPath) != os.path.abspath(newPath): elif os.path.abspath(oldPath) != os.path.abspath(newPath):
if verbose: if verbose:
print('Copying {} to {}...'.format(oldPath, newPath)) print('Copying {} to {}...'.format(oldPath, newPath))
@ -111,6 +112,7 @@ def updateMachO(bin, execPath, root):
args = [installNameTool] args = [installNameTool]
for path, oldExecPath, newExecPath in toUpdate: for path, oldExecPath, newExecPath in toUpdate:
if path != bin: if path != bin:
if path:
updateMachO(path, execPath, root) updateMachO(path, execPath, root)
if verbose: if verbose:
print('Updating Mach-O load from {} to {}...'.format(oldExecPath, newExecPath)) print('Updating Mach-O load from {} to {}...'.format(oldExecPath, newExecPath))