diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-10-17 15:28:49 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-10-19 12:16:10 +0000 |
| commit | c0277527d996156304324e9cadd25affc98b7428 (patch) | |
| tree | 7876e584abe441ff6d032ddcd18a78abe2a00978 | |
| parent | e062d5866fdcc481772d577c3c9e4261916cff43 (diff) | |
| download | qbs-c0277527d996156304324e9cadd25affc98b7428.tar.gz | |
Fix handling static mode in pkgconfig
Change-Id: I51b731afee1ed3c084be03813c203e2817fcfd9b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/module-providers/qbspkgconfig.qbs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs index 923355e57..40f0526ed 100644 --- a/share/qbs/module-providers/qbspkgconfig.qbs +++ b/share/qbs/module-providers/qbspkgconfig.qbs @@ -108,7 +108,10 @@ ModuleProvider { result.commonCompilerFlags = pkg.cflags.filter(typeFilter(PkgConfig.CompilerFlag)).map(mapper); - var libsInfo = !staticMode ? getLibsInfo(pkg.libs) : getLibsInfo(pkg.libsPrivate); + var allLibs = pkg.libs; + if (staticMode) + allLibs = allLibs.concat(pkg.libsPrivate); + var libsInfo = getLibsInfo(allLibs); for (var key in libsInfo) { result[key] = libsInfo[key]; } |