diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-24 12:00:04 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-06-26 18:08:44 +0200 |
| commit | f37ae8e0d49c51a4858b1c2b92135dc83c92b543 (patch) | |
| tree | d4fe9300d9e12000f3df0abe17a35d5078fdd51a | |
| parent | 35087f946e10af028cdcb96fb8be180783ea3307 (diff) | |
MSVC: do not collect static lib from object inputs
There is no point in attaching static libraries to object artifacts.
MSVC is the only toolchain where we did this.
Change-Id: I81e80b5ba4bfedbbb7cb3a9394c73709d7d091c9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index 68ced1a45..ba939bff7 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -133,7 +133,7 @@ CppModule { prepare: { var libraryPaths = ModUtils.moduleProperties(product, 'libraryPaths'); var dynamicLibraries = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary_import, 'cpp', 'dynamicLibraries'); - var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, (inputs.staticlibrary || []).concat(inputs.obj), 'cpp', 'staticLibraries'); + var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, inputs.staticlibrary, 'cpp', 'staticLibraries'); var linkerFlags = ModUtils.moduleProperties(product, 'platformLinkerFlags').concat( ModUtils.moduleProperties(product, 'linkerFlags')); return MSVC.prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries, staticLibraries, linkerFlags) @@ -160,7 +160,7 @@ CppModule { prepare: { var libraryPaths = ModUtils.moduleProperties(product, 'libraryPaths'); var dynamicLibraries = ModUtils.moduleProperties(product, 'dynamicLibraries'); - var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, (inputs.staticlibrary || []).concat(inputs.obj), 'cpp', 'staticLibraries'); + var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, inputs.staticlibrary, 'cpp', 'staticLibraries'); var linkerFlags = ModUtils.moduleProperties(product, 'platformLinkerFlags').concat( ModUtils.moduleProperties(product, 'linkerFlags')); return MSVC.prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries, staticLibraries, linkerFlags) |