fix archs for vs/vsxmake generator

xmake-io · Sep 12, 2022 · 1bf418b · 1bf418b
1 parent 0672eae
commit 1bf418b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua
@@ -469,6 +469,9 @@ function _make_vsinfo_archs()
                 vsinfo_archs = allowed_archs:to_array()
             end
         end
+        if not vsinfo_archs then
+            vsinfo_archs = toolchain.load("msvc"):config("vcarchs")
+        end
         if not vsinfo_archs then
             vsinfo_archs = platform.archs()
         end

diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -27,6 +27,7 @@ import("core.project.project")
 import("core.platform.platform")
 import("core.tool.compiler")
 import("core.tool.linker")
+import("core.tool.toolchain")
 import("core.cache.memcache")
 import("core.cache.localcache")
 import("lib.detect.find_tool")
@@ -287,6 +288,9 @@ function _make_vsinfo_archs()
                 vsinfo_archs = allowed_archs:to_array()
             end
         end
+        if not vsinfo_archs then
+            vsinfo_archs = toolchain.load("msvc"):config("vcarchs")
+        end
         if not vsinfo_archs then
             vsinfo_archs = platform.archs()
         end

diff --git a/xmake/toolchains/msvc/check.lua b/xmake/toolchains/msvc/check.lua
@@ -63,6 +63,7 @@ function _check_vsenv(toolchain)
 
                 -- save vcvars
                 toolchain:config_set("vcvars", vcvars)
+                toolchain:config_set("vcarchs", table.orderkeys(vcvarsall))
                 toolchain:config_set("vs_toolset", vcvars.VCToolsVersion)
                 toolchain:config_set("vs_sdkver", vcvars.WindowsSDKVersion)