clang-cl: Fix macro dumping

Previously, clang.exe was used to dump macro as clang-cl does not
support the MSVC way. Also, architecture was not detected correctly
because of the wrong assumption that clang-cl respects arch variables
set by the vcvarsall.bat

Change-Id: Ic6464c2bd90f1a2fceb2f8aa884721872179ff49
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 5 insertions, 3 deletions

diff --git a/share/qbs/imports/qbs/Probes/ClangClProbe.qbs b/share/qbs/imports/qbs/Probes/ClangClProbe.qbs
index c7687f0e9..8205e92fa 100644
--- a/share/qbs/imports/qbs/Probes/ClangClProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/ClangClProbe.qbs
@@ -39,7 +39,7 @@ PathProbe {
     property string compilerFilePath
     property string vcvarsallFilePath
     property stringList enableDefinesByLanguage
-    property string architecture
+    property string preferredArchitecture
     property string _nullDevice: qbs.nullDevice
     property string _pathListSeparator: qbs.pathListSeparator
 
@@ -48,6 +48,7 @@ PathProbe {
     property int versionMinor
     property int versionPatch
     property stringList includePaths
+    property string architecture
     property var buildEnv
     property var compilerDefinesByLanguage
 
@@ -57,9 +58,9 @@ PathProbe {
             languages = ["c"];
 
         var info = languages.contains("c")
-                ? Utilities.clangClCompilerInfo(compilerFilePath, architecture, vcvarsallFilePath, "c") : {};
+                ? Utilities.clangClCompilerInfo(compilerFilePath, preferredArchitecture, vcvarsallFilePath, "c") : {};
         var infoCpp = languages.contains("cpp")
-                ? Utilities.clangClCompilerInfo(compilerFilePath, architecture, vcvarsallFilePath, "cpp") : {};
+                ? Utilities.clangClCompilerInfo(compilerFilePath, preferredArchitecture, vcvarsallFilePath, "cpp") : {};
         found = (!languages.contains("c") ||
                  (!!info && !!info.macros && !!info.buildEnvironment))
              && (!languages.contains("cpp") ||
@@ -84,5 +85,6 @@ PathProbe {
                                                 [], _nullDevice,
                                                 _pathListSeparator, "", "");
         includePaths = defaultPaths.includePaths;
+        architecture = ModUtils.guessArchitecture(macros);
     }
 }