summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-03-23 00:15:02 +0800
committerruki <[email protected]>2024-03-23 00:15:02 +0800
commita4b0293cb473fb9da151ae1d55588316c69c2bb8 (patch)
treedcd37e38b9c6b3af61abee3cf6eeceb697da0ecc
parente3c73d10f93a727ab7e8a710c1e91057391315c3 (diff)
improve _get_msvc
-rw-r--r--xmake/modules/package/tools/gn.lua2
-rw-r--r--xmake/modules/package/tools/meson.lua2
-rw-r--r--xmake/modules/package/tools/msbuild.lua2
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