diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-29 10:42:15 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-01-29 12:11:42 +0100 |
commit | e679b1c6395484f145c309d64f7bb432f661aaac (patch) | |
tree | e33e67ecfa79e037d68ababd363e861024cce3ad /share/qbs/modules | |
parent | e9bcce83a773cafa8777307a7cee67d8085707e6 (diff) |
fix duplicate arguments in linker command line
Task-number: QBS-501
Change-Id: I103041729bcdef35bd62a3ed8ec9190c684d17b5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share/qbs/modules')
-rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 4 | ||||
-rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index fad11198b..0cbb2b982 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -102,7 +102,7 @@ CppModule { for (var i in inputs.dynamiclibrary_copy) { var lib = inputs.dynamiclibrary_copy[i] var impliedLibs = ModUtils.moduleProperties(lib, 'transitiveSOs') - var libsToAdd = impliedLibs.concat([lib.fileName]); + var libsToAdd = impliedLibs.uniqueConcat([lib.fileName]); result = result.uniqueConcat(libsToAdd); } return result @@ -218,7 +218,7 @@ CppModule { var lib = inputs.staticlibrary[i] result.push(lib.fileName) var impliedLibs = ModUtils.moduleProperties(lib, 'staticLibraries') - result = result.concat(impliedLibs); + result = result.uniqueConcat(impliedLibs); } return result } diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index c112625bd..0137970d1 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -209,7 +209,7 @@ CppModule { var lib = inputs.staticlibrary[i] result.push(lib.fileName) var impliedLibs = ModUtils.moduleProperties(lib, 'staticLibraries') - result = result.concat(impliedLibs); + result = result.uniqueConcat(impliedLibs); } return result } |