diff options
| -rw-r--r-- | xmake/modules/detect/sdks/find_vstudio.lua | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index 617940d67..f25f582cc 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -266,20 +266,9 @@ function _find_vstudio(opt) if vcvarsall and os.isfile(vcvarsall) and vsvers[VisualStudioVersion] then -- load vcvarsall - local vcvarsall_x86 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x86", opt) - local vcvarsall_x64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x64", opt) - - -- load vcvarsall for arm64 - local arch - local arch_os = os.arch() - if arch_os == "x64" then - arch = "x64_arm64" - elseif arch_os == "x86" then - arch = "x86_arm64" - elseif arch_os == "arm64" then - arch = "arm64" - end - local vcvarsall_arm64 = arch and _load_vcvarsall(vcvarsall, version, arch, opt) or nil + local vcvarsall_x86 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x86", opt) + local vcvarsall_x64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x64", opt) + local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "arm64", opt) -- save results local results = {} @@ -371,20 +360,9 @@ function _find_vstudio(opt) if vcvarsall then -- load vcvarsall - local vcvarsall_x86 = _load_vcvarsall(vcvarsall, version, "x86", opt) - local vcvarsall_x64 = _load_vcvarsall(vcvarsall, version, "x64", opt) - - -- load vcvarsall for arm64 - local arch - local arch_os = os.arch() - if arch_os == "x64" then - arch = "x64_arm64" - elseif arch_os == "x86" then - arch = "x86_arm64" - elseif arch_os == "arm64" then - arch = "arm64" - end - local vcvarsall_arm64 = arch and _load_vcvarsall(vcvarsall, version, arch, opt) or nil + local vcvarsall_x86 = _load_vcvarsall(vcvarsall, version, "x86", opt) + local vcvarsall_x64 = _load_vcvarsall(vcvarsall, version, "x64", opt) + local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, version, "arm64", opt) -- save results results[vsvers[version]] = {version = version, vcvarsall_bat = vcvarsall, vcvarsall = {x86 = vcvarsall_x86, x64 = vcvarsall_x64, arm64 = vcvarsall_arm64}} |