diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-07-30 11:07:18 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-10-09 07:27:14 +0000 |
| commit | a1ea49878927dfe267416c795b50f3d5bdfa0b84 (patch) | |
| tree | 53c09100fb76cae643282951336a3701071d2685 | |
| parent | ca81c884f876d54a21c70b09652f053be4c5b45c (diff) | |
configure: Do use pkg-config --libs for static libs
This ensures that also linker commands like -pthread are returned.
Fixes: QTBUG-77159
Change-Id: If9ab3797ccfb52c6b96a4ab120c59fd8896d5466
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 4ddc50c0cd16ddd146ea9ea21d6565c8f4a5e2bc)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 9be4fb6f1f..81110e9f6d 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -825,9 +825,7 @@ defineTest(qtConfLibrary_pkgConfig) { !qtConfResolveLibs($${1}.libs, $$libs): \ return(false) contains($${1}.libs, ".*\\.$${QMAKE_EXTENSION_STATICLIB}$") { - qtRunLoggedCommand("$$pkg_config --static --libs-only-L $$args", libpaths)|return(false) - qtRunLoggedCommand("$$pkg_config --static --libs-only-l $$args", libs)|return(false) - eval(libs = $$libpaths $$libs) + qtRunLoggedCommand("$$pkg_config --static --libs $$args", libs)|return(false) !qtConfResolveLibs($${1}.libs, $$libs): \ return(false) } |