diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-01-03 18:49:51 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-01-10 16:21:12 +0100 |
| commit | 9a2198f9cdd5df482c64a52cb5d1e372ac24610c (patch) | |
| tree | 4bf4d0898a1a666c92e513fe7487642512a3eab9 /src/tools/macdeployqt/shared/shared.cpp | |
| parent | 40cb7434afe28c4dbe434a35b659e1af5299a3d9 (diff) | |
macdeployqt: Don't remove rpaths more than once
In a universal build the tool will find multiple duplicated rpaths,
but the install_name tool doesn't like it if we try to remove it
more than once.
Fixes: QTBUG-109738
Pick-to: 6.5 6.4 6.2
Change-Id: I4a8bea0ad3e47b28e6384ceead551edc83e30d26
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/tools/macdeployqt/shared/shared.cpp')
| -rw-r--r-- | src/tools/macdeployqt/shared/shared.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp index 8df6199abe2..643fe5390a7 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp @@ -874,7 +874,8 @@ void deployRPaths(const QString &bundlePath, const QList<QString> &rpaths, const continue; } if (rpaths.contains(resolveDyldPrefix(rpath, binaryPath, binaryPath))) { - args << "-delete_rpath" << rpath; + if (!args.contains(rpath)) + args << "-delete_rpath" << rpath; } } if (!args.length()) { |