diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2022-06-27 10:21:13 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2022-06-28 09:03:52 +0000 |
| commit | 40ddf2c7f34e429af4d18063ca947490cdc12ba9 (patch) | |
| tree | 32c16ba3fd25725fd138441748e063a67e1e41ae | |
| parent | d4b27d9b527c113452987a9af83c54d4f5d077d3 (diff) | |
Fix an incorrect invocation of llvm-readobj
It's never been entirely sound or necessarily correct to use single-dash
options for long options. Various other things invoked by androiddeployqt
seem to provide only single-dash options, but llvm tools and GNU tools
always provide a double-dash option. Therefore we can just change the
--needed-libs option to use double-dash without any particular version
checks or differences.
Task-number: QTBUG-104580
Pick-to: 6.4 6.3 6.2 5.15
Change-Id: I5649b0f9565989157d934c802da1f3c4c43fca0f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index b326150ed0..f42bd86fae 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -281,7 +281,7 @@ QString fileArchitecture(const Options &options, const QString &path) return {}; } - readElf = "%1 -needed-libs %2"_L1.arg(shellQuote(readElf), shellQuote(path)); + readElf = "%1 --needed-libs %2"_L1.arg(shellQuote(readElf), shellQuote(path)); FILE *readElfCommand = openProcess(readElf); if (!readElfCommand) { @@ -1840,7 +1840,7 @@ QStringList getQtLibsFromElf(const Options &options, const QString &fileName) return QStringList(); } - readElf = "%1 -needed-libs %2"_L1.arg(shellQuote(readElf), shellQuote(fileName)); + readElf = "%1 --needed-libs %2"_L1.arg(shellQuote(readElf), shellQuote(fileName)); FILE *readElfCommand = openProcess(readElf); if (!readElfCommand) { |