Merge pull request #4190

502972f Fix Error: No file at @loader_path/libboost_system-mt.dylib (Federico Bond)
This commit is contained in:
Wladimir J. van der Laan 2014-07-10 08:04:39 +02:00
commit f2286a69a9
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -211,6 +211,7 @@ def getFrameworks(binaryPath, verbose):
libraries = []
for line in otoolLines:
line = line.replace("@loader_path", os.path.dirname(binaryPath))
info = FrameworkInfo.fromOtoolLibraryLine(line.strip())
if info is not None:
if verbose >= 3:
@ -307,7 +308,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym
if deploymentInfo.qtPath is None and framework.isQtFramework():
deploymentInfo.detectQtPath(framework.frameworkDirectory)
if framework.installName.startswith("@executable_path"):
if framework.installName.startswith("@executable_path") or framework.installName.startswith(bundlePath):
if verbose >= 2:
print framework.frameworkName, "already deployed, skipping."
continue