diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-12-13 13:51:25 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-12-13 13:51:25 +0300 |
| commit | 119d6195adcd1bceb6eabb59062d54b639ca22a7 (patch) | |
| tree | 40db0335c122bd41205d0399a3a87091e56d8ccd /share/qbs/modules/cpp | |
| parent | 8538cb992043eb680c1b7acaf133e4147e1db86a (diff) | |
| parent | 137e1f968935a583a18c6a9c567ad043aff91360 (diff) | |
| download | qbs-119d6195adcd1bceb6eabb59062d54b639ca22a7.tar.gz | |
Merge branch '1.21' into master
Change-Id: Ia540ffdfbcb1e51146dba53337defd09ded66f1a
Diffstat (limited to 'share/qbs/modules/cpp')
| -rw-r--r-- | share/qbs/modules/cpp/MingwBaseModule.qbs | 1 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/gcc.js | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/MingwBaseModule.qbs b/share/qbs/modules/cpp/MingwBaseModule.qbs index 831512c5c..e96f8ba41 100644 --- a/share/qbs/modules/cpp/MingwBaseModule.qbs +++ b/share/qbs/modules/cpp/MingwBaseModule.qbs @@ -44,6 +44,7 @@ GenericGCC { windowsApiCharacterSet: "unicode" platformDefines: base.concat(WindowsUtils.characterSetDefines(windowsApiCharacterSet)) .concat("WIN32") + runtimeLibrary: "dynamic" Properties { condition: product.multiplexByQbsProperties.contains("buildVariants") diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index 0f24b4aa1..c7bf66de3 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -529,6 +529,8 @@ function linkerFlags(project, product, inputs, outputs, primaryOutput, linkerPat Array.prototype.push.apply(escapedLinkerFlags, args); if (useCompilerDriver) escapedLinkerFlags = escapedLinkerFlags.concat(Cpp.collectMiscLinkerArguments(product)); + if (product.qbs.toolchain.contains("mingw") && product.cpp.runtimeLibrary === "static") + escapedLinkerFlags = ['-static-libgcc', '-static-libstdc++'].concat(escapedLinkerFlags); return escapedLinkerFlags; } |