From a4b0293cb473fb9da151ae1d55588316c69c2bb8 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 23 Mar 2024 00:15:02 +0800 Subject: improve _get_msvc --- xmake/modules/package/tools/gn.lua | 2 +- xmake/modules/package/tools/meson.lua | 2 +- xmake/modules/package/tools/msbuild.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xmake/modules/package/tools/gn.lua b/xmake/modules/package/tools/gn.lua index cdcbc298a..9cef0bf7f 100644 --- a/xmake/modules/package/tools/gn.lua +++ b/xmake/modules/package/tools/gn.lua @@ -72,7 +72,7 @@ end -- get msvc function _get_msvc(package) - local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) + local msvc = package:toolchain("msvc") assert(msvc:check(), "vs not found!") -- we need to check vs envs if it has been not checked yet return msvc end diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index d567d9cb5..f03758373 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -347,7 +347,7 @@ end -- get msvc function _get_msvc(package) - local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) + local msvc = package:toolchain("msvc") assert(msvc:check(), "vs not found!") -- we need to check vs envs if it has been not checked yet return msvc end diff --git a/xmake/modules/package/tools/msbuild.lua b/xmake/modules/package/tools/msbuild.lua index 5897c357f..34aa86453 100644 --- a/xmake/modules/package/tools/msbuild.lua +++ b/xmake/modules/package/tools/msbuild.lua @@ -31,7 +31,7 @@ end -- get msvc function _get_msvc(package) - local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) + local msvc = package:toolchain("msvc") assert(msvc:check(), "vs not found!") -- we need to check vs envs if it has been not checked yet return msvc end -- cgit v1.3.1