diff options
| author | Timo Aarnipuro <timo.aarnipuro@qt.io> | 2019-02-01 15:20:20 +0200 |
|---|---|---|
| committer | Timo Aarnipuro <timo.aarnipuro@qt.io> | 2019-03-20 07:09:27 +0000 |
| commit | b4b8ea6181760ac3005868ed2f3b711ca29ca774 (patch) | |
| tree | 3f2f37244d86e1635749fcc765cc939240a54871 /mkspecs | |
| parent | 75b3c471b3acea8fd0531dc38913181b1bcd941d (diff) | |
configure: Allow libraries to be defined with exact filename
INTEGRITY compiler searches for exact filename if the -l argument already
contains .a suffix. GNU linker uses exact filename if -l argument begins
with a colon.
Change-Id: I62be8f1e6b9c7dc7eaa5ab3d4bfc55460d729737
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index e845bf1577..62ad972796 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -540,7 +540,15 @@ defineTest(qtConfResolveLibs) { } else: contains(l, "^-l.*") { lib = $$replace(l, "^-l", ) lcan = - unix { + integrity:contains(lib, "^.*\\.a") { + # INTEGRITY compiler searches for exact filename + # if -l argument has .a suffix + lcan += $${lib} + } else: contains(lib, "^:.*") { + # Use exact filename when -l:filename syntax is used. + lib ~= s/^:// + lcan += $${lib} + } else: unix { # Under UNIX, we look for actual shared libraries, in addition # to static ones. shexts = $$QMAKE_EXTENSION_SHLIB $$QMAKE_EXTENSIONS_AUX_SHLIB |