diff options
| author | Jonas Kvinge <jonas@jkvinge.net> | 2022-08-30 19:36:52 +0200 |
|---|---|---|
| committer | Jonas Kvinge <jonas@jkvinge.net> | 2022-09-01 19:03:00 +0200 |
| commit | 2e8c84cda25de38d64669a9d078d87c7d2bf451c (patch) | |
| tree | dfdf91ffcb8204b9322d54717c5cda0fcc6f84db /src/tools | |
| parent | 9e05c9ad86cb0e4fb6439531600817b2960c02dd (diff) | |
macdeployqt: Fix deploying libraries with `reexport`
Fixes deploying libgcc, currently it fails to change the rpaths with the
following error:
ERROR: Could not parse otool output line:
"\t/usr/local/opt/gcc/lib/gcc/11/libgcc_s.1.1.dylib
(compatibility version 1.0.0, current version 1.1.0, reexport)"
Pick-to: 6.3 6.4
Change-Id: I5c866a375f88e3b222cbdbebc167b04174f753b2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/macdeployqt/shared/shared.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp index fa22b47067..63767c23fa 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp @@ -161,7 +161,7 @@ OtoolInfo findDependencyInfo(const QString &binaryPath) static const QRegularExpression regexp(QStringLiteral( "^\\t(.+) \\(compatibility version (\\d+\\.\\d+\\.\\d+), " - "current version (\\d+\\.\\d+\\.\\d+)(, weak)?\\)$")); + "current version (\\d+\\.\\d+\\.\\d+)(, weak|, reexport)?\\)$")); QString output = otool.readAllStandardOutput(); QStringList outputLines = output.split("\n", Qt::SkipEmptyParts); |