Merge branch '1.15' into master

Change-Id: I893a0c195de293fead09db63b7fcdf48bbfab61c

1 files changed, 9 insertions, 1 deletions

diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index b67ab811f..8b7864400 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -135,6 +135,13 @@ function prepareCompiler(project, product, inputs, outputs, input, output, expli
         break;
     }
 
+    if (input.qbs.toolchain.contains("clang-cl")) {
+        if (input.cpp.architecture === "x86")
+            args.push("-m32");
+        else if (input.cpp.architecture === "x86_64")
+            args.push("-m64");
+    }
+
     if (debugInformation) {
         if (product.cpp.separateDebugInformation)
             args.push('/Zi');
@@ -315,7 +322,6 @@ function collectLibraryDependencies(product) {
     function traverse(dep) {
         if (seen.hasOwnProperty(dep.name))
             return;
-        seen[dep.name] = true;
 
         if (dep.parameters.cpp && dep.parameters.cpp.link === false)
             return;
@@ -324,10 +330,12 @@ function collectLibraryDependencies(product) {
         var dynamicLibraryArtifacts = staticLibraryArtifacts
                 ? null : dep.artifacts["dynamiclibrary_import"];
         if (staticLibraryArtifacts) {
+            seen[dep.name] = true;
             dep.dependencies.forEach(traverse);
             addArtifactFilePaths(dep, staticLibraryArtifacts);
             addExternalLibs(dep);
         } else if (dynamicLibraryArtifacts) {
+            seen[dep.name] = true;
             addArtifactFilePaths(dep, dynamicLibraryArtifacts);
         }
     }