C/C++: Prevent adjacent duplicate libs

It is never necessary to have the same library on the linker command
line twice in a row, so we can safely remove such duplicates.

Change-Id: Ie6ebe489862702828996fb78533eb4ac400df1cd
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>

2 files changed, 10 insertions, 1 deletions

diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 7e25fa402..6936beb5e 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -440,9 +440,13 @@ function linkerFlags(project, product, inputs, outputs, primaryOutput, linkerPat
     }
 
     var wholeArchiveActive = false;
+    var prevLib;
     for (i = 0; i < libraryDependencies.libraries.length; ++i) {
         var dep = libraryDependencies.libraries[i];
         var lib = dep.filePath;
+        if (lib === prevLib)
+            continue;
+        prevLib = lib;
         if (dep.wholeArchive && !wholeArchiveActive) {
             var wholeArchiveFlag;
             if (isDarwin) {
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index 5da2ad0cf..9deffa064 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -449,10 +449,15 @@ function prepareLinker(project, product, inputs, outputs, input, output) {
     var wholeArchiveSupported = linkerSupportsWholeArchive(product);
     var wholeArchiveRequested = false;
     var libDeps = collectLibraryDependencies(product);
+    var prevLib;
     for (i = 0; i < libDeps.length; ++i) {
         var dep = libDeps[i];
+        var lib = dep.filePath;
+        if (lib === prevLib)
+            continue;
+        prevLib = lib;
         args.push((wholeArchiveSupported && dep.wholeArchive ? "/WHOLEARCHIVE:" : "")
-                  + FileInfo.toWindowsSeparators(dep.filePath));
+                  + FileInfo.toWindowsSeparators(lib));
         if (dep.wholeArchive)
             wholeArchiveRequested = true;
     }