rename toolsets to toolset

22 files changed, 176 insertions, 176 deletions

diff --git a/tests/apis/set_toolchains/xmake.lua b/tests/apis/set_toolchains/xmake.lua
index f2433cb45..2b47ab40e 100644
--- a/tests/apis/set_toolchains/xmake.lua
+++ b/tests/apis/set_toolchains/xmake.lua
@@ -4,17 +4,17 @@ toolchain("myclang")
     -- mark as standalone toolchain
     set_kind("standalone")
         
-    -- set toolsets
-    set_toolsets("cc", "clang")
-    set_toolsets("cxx", "clang", "clang++")
-    set_toolsets("ld", "clang++", "clang")
-    set_toolsets("sh", "clang++", "clang")
-    set_toolsets("ar", "ar")
-    set_toolsets("ex", "ar")
-    set_toolsets("strip", "strip")
-    set_toolsets("mm", "clang")
-    set_toolsets("mxx", "clang", "clang++")
-    set_toolsets("as", "clang")
+    -- set toolset
+    set_toolset("cc", "clang")
+    set_toolset("cxx", "clang", "clang++")
+    set_toolset("ld", "clang++", "clang")
+    set_toolset("sh", "clang++", "clang")
+    set_toolset("ar", "ar")
+    set_toolset("ex", "ar")
+    set_toolset("strip", "strip")
+    set_toolset("mm", "clang")
+    set_toolset("mxx", "clang", "clang++")
+    set_toolset("as", "clang")
 
     add_defines("MYCLANG")
 
@@ -25,7 +25,7 @@ add_rules("mode.debug", "mode.release")
 target("test")
     set_kind("static")
     add_files("src/interface.cpp")
-    set_toolsets("ar", "ar")
+    set_toolset("ar", "ar")
 
 target("demo")
     set_kind("binary")
diff --git a/xmake/core/project/deprecated/project.lua b/xmake/core/project/deprecated/project.lua
index b42a3b40b..5cf272003 100644
--- a/xmake/core/project/deprecated/project.lua
+++ b/xmake/core/project/deprecated/project.lua
@@ -253,7 +253,7 @@ function deprecated_project._api_target_set_tools(interp)
     interp:_api_within_scope_set("target", "set_tools", function (key, value, ...) 
 
                                             -- deprecated
-                                            deprecated.add("set_toolsets(%s, %s)", "set_tools(%s, %s)", tostring(key), tostring(value))
+                                            deprecated.add("set_toolset(%s, %s)", "set_tools(%s, %s)", tostring(key), tostring(value))
                                           
                                             -- dispatch it
                                             apifunc(key, value, ...)
@@ -271,7 +271,7 @@ function deprecated_project._api_target_set_toolchain(interp)
     interp:_api_within_scope_set("target", "set_toolchain", function (key, value, ...) 
 
                                             -- deprecated
-                                            deprecated.add("set_toolsets(%s, %s)", "set_toolchain(%s, %s)", tostring(key), tostring(value))
+                                            deprecated.add("set_toolset(%s, %s)", "set_toolchain(%s, %s)", tostring(key), tostring(value))
                                           
                                             -- dispatch it
                                             apifunc(key, value, ...)
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index e5d29f36d..1538d7930 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -1681,7 +1681,7 @@ function _instance:tool(toolkind)
         toolinfo = {}
 
         -- get program from set_toolchain/set_tools (deprecated)
-        program = self:get("toolsets." .. toolkind) or self:get("toolchain." .. toolkind)
+        program = self:get("toolset." .. toolkind) or self:get("toolchain." .. toolkind)
         if not program then
             local tools = self:get("tools") -- TODO: deprecated
             if tools then
@@ -1795,7 +1795,7 @@ function target.apis()
         ,   "target.set_configvar"
         ,   "target.set_runenv"
         ,   "target.set_toolchain" -- TODO: deprecated
-        ,   "target.set_toolsets"
+        ,   "target.set_toolset"
         ,   "target.set_policy"
             -- target.add_xxx
         ,   "target.add_values"
diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua
index 7b0463b25..6e48ef836 100644
--- a/xmake/core/tool/toolchain.lua
+++ b/xmake/core/tool/toolchain.lua
@@ -113,7 +113,7 @@ end
 
 -- get the program and name of the given tool kind
 function _instance:tool(toolkind)
-    local toolpathes = self:get("toolsets." .. toolkind)
+    local toolpathes = self:get("toolset." .. toolkind)
     if toolpathes then
         for _, toolpath in ipairs(table.wrap(toolpathes)) do
             local program, toolname = self:_checktool(toolkind, toolpath)
@@ -224,7 +224,7 @@ function _instance:_checktool(toolkind, toolpath)
         self._find_tool = find_tool
     end
 
-    -- do filter for toolpath variables, e.g. set_toolsets("cc", "$(env CC)")
+    -- do filter for toolpath variables, e.g. set_toolset("cc", "$(env CC)")
     local sandbox_inst = sandbox.instance()
     if sandbox_inst then
         local filter = sandbox_inst:filter()
@@ -302,8 +302,8 @@ function toolchain.apis()
         {
             -- toolchain.set_xxx
             "toolchain.set_formats"
-        ,   "toolchain.set_toolsets"
-        ,   "toolchain.add_toolsets"
+        ,   "toolchain.set_toolset"
+        ,   "toolchain.add_toolset"
             -- toolchain.add_xxx
         ,   "toolchain.add_runenvs"
         }
diff --git a/xmake/toolchains/clang/xmake.lua b/xmake/toolchains/clang/xmake.lua
index 7b296f1a1..1319d9899 100644
--- a/xmake/toolchains/clang/xmake.lua
+++ b/xmake/toolchains/clang/xmake.lua
@@ -28,17 +28,17 @@ toolchain("clang")
     -- mark as standalone toolchain
     set_kind("standalone")
         
-    -- set toolsets
-    set_toolsets("cc", "clang")
-    set_toolsets("cxx", "clang", "clang++")
-    set_toolsets("ld", "clang++", "clang")
-    set_toolsets("sh", "clang++", "clang")
-    set_toolsets("ar", "ar")
-    set_toolsets("ex", "ar")
-    set_toolsets("strip", "strip")
-    set_toolsets("mm", "clang")
-    set_toolsets("mxx", "clang", "clang++")
-    set_toolsets("as", "clang")
+    -- set toolset
+    set_toolset("cc", "clang")
+    set_toolset("cxx", "clang", "clang++")
+    set_toolset("ld", "clang++", "clang")
+    set_toolset("sh", "clang++", "clang")
+    set_toolset("ar", "ar")
+    set_toolset("ex", "ar")
+    set_toolset("strip", "strip")
+    set_toolset("mm", "clang")
+    set_toolset("mxx", "clang", "clang++")
+    set_toolset("as", "clang")
 
     -- check toolchain
     on_check(function (toolchain)
diff --git a/xmake/toolchains/cross/xmake.lua b/xmake/toolchains/cross/xmake.lua
index d19b82915..52361d7e9 100644
--- a/xmake/toolchains/cross/xmake.lua
+++ b/xmake/toolchains/cross/xmake.lua
@@ -39,17 +39,17 @@ toolchain("cross")
         -- get cross prefix
         local cross = config.get("cross") or ""
 
-        -- set toolsets
-        toolchain:set("toolsets", "cc", cross .. "gcc", cross .. "clang")
-        toolchain:set("toolsets", "cxx", cross .. "gcc", cross .. "clang", cross .. "g++", cross .. "clang++")
-        toolchain:set("toolsets", "cpp", cross .. "gcc -E", cross .. "clang -E")
-        toolchain:set("toolsets", "as", cross .. "gcc", cross .. "clang")
-        toolchain:set("toolsets", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
-        toolchain:set("toolsets", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
-        toolchain:set("toolsets", "ar", cross .. "ar")
-        toolchain:set("toolsets", "ex", cross .. "ar")
-        toolchain:set("toolsets", "ranlib", cross .. "ranlib")
-        toolchain:set("toolsets", "strip", cross .. "strip")
+        -- set toolset
+        toolchain:set("toolset", "cc", cross .. "gcc", cross .. "clang")
+        toolchain:set("toolset", "cxx", cross .. "gcc", cross .. "clang", cross .. "g++", cross .. "clang++")
+        toolchain:set("toolset", "cpp", cross .. "gcc -E", cross .. "clang -E")
+        toolchain:set("toolset", "as", cross .. "gcc", cross .. "clang")
+        toolchain:set("toolset", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolset", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolset", "ar", cross .. "ar")
+        toolchain:set("toolset", "ex", cross .. "ar")
+        toolchain:set("toolset", "ranlib", cross .. "ranlib")
+        toolchain:set("toolset", "strip", cross .. "strip")
 
         -- init linkdirs and includedirs
         local sdkdir = toolchain:sdkdir()
diff --git a/xmake/toolchains/cuda/xmake.lua b/xmake/toolchains/cuda/xmake.lua
index a0a048b60..f667c81f0 100644
--- a/xmake/toolchains/cuda/xmake.lua
+++ b/xmake/toolchains/cuda/xmake.lua
@@ -25,8 +25,8 @@ toolchain("cuda")
     set_homepage("https://developer.nvidia.com/cuda-toolkit")
     set_description("CUDA Toolkit")
         
-    -- set toolsets
-    set_toolsets("cu",   "nvcc", "clang")
-    set_toolsets("culd", "nvcc")
-    set_toolsets("cu-ccbin", "$(env CXX)", "$(env CC)", "clang", "gcc")
+    -- set toolset
+    set_toolset("cu",   "nvcc", "clang")
+    set_toolset("culd", "nvcc")
+    set_toolset("cu-ccbin", "$(env CXX)", "$(env CC)", "clang", "gcc")
 
diff --git a/xmake/toolchains/dlang/xmake.lua b/xmake/toolchains/dlang/xmake.lua
index 79ec22fb6..0c87d8505 100644
--- a/xmake/toolchains/dlang/xmake.lua
+++ b/xmake/toolchains/dlang/xmake.lua
@@ -25,11 +25,11 @@ toolchain("dlang")
     set_homepage("https://dlang.org/")
     set_description("D Programming Language Compiler")
         
-    -- set toolsets
-    set_toolsets("dc",   "$(env DC)", "dmd", "ldc2", "gdc")
-    set_toolsets("dcld", "$(env DC)", "dmd", "ldc2", "gdc")
-    set_toolsets("dcsh", "$(env DC)", "dmd", "ldc2", "gdc")
-    set_toolsets("dcar", "$(env DC)", "dmd", "ldc2", "gdc")
+    -- set toolset
+    set_toolset("dc",   "$(env DC)", "dmd", "ldc2", "gdc")
+    set_toolset("dcld", "$(env DC)", "dmd", "ldc2", "gdc")
+    set_toolset("dcsh", "$(env DC)", "dmd", "ldc2", "gdc")
+    set_toolset("dcar", "$(env DC)", "dmd", "ldc2", "gdc")
 
     -- on load
     on_load(function (toolchain)
diff --git a/xmake/toolchains/envs/xmake.lua b/xmake/toolchains/envs/xmake.lua
index 46ef2f23a..64e7906fb 100644
--- a/xmake/toolchains/envs/xmake.lua
+++ b/xmake/toolchains/envs/xmake.lua
@@ -24,17 +24,17 @@ toolchain("envs")
     -- set description
     set_description("Environment variables toolchain")
         
-    -- set toolsets
-    set_toolsets("cc",    "$(env CC)")
-    set_toolsets("cxx",   "$(env CXX)")
-    set_toolsets("ld",    "$(env LD)", "$(env CXX)")
-    set_toolsets("sh",    "$(env SH)", "$(env LD)", "$(env CXX)")
-    set_toolsets("ar",    "$(env AR)")
-    set_toolsets("ex",    "$(env EX)", "$(env AR)")
-    set_toolsets("strip", "$(env STRIP)")
-    set_toolsets("ranlib","$(env RANLIB)")
-    set_toolsets("mm",    "$(env MM)")
-    set_toolsets("mxx",   "$(env MXX)")
-    set_toolsets("as",    "$(env AS)")
-    set_toolsets("sc",    "$(env SC)")
+    -- set toolset
+    set_toolset("cc",    "$(env CC)")
+    set_toolset("cxx",   "$(env CXX)")
+    set_toolset("ld",    "$(env LD)", "$(env CXX)")
+    set_toolset("sh",    "$(env SH)", "$(env LD)", "$(env CXX)")
+    set_toolset("ar",    "$(env AR)")
+    set_toolset("ex",    "$(env EX)", "$(env AR)")
+    set_toolset("strip", "$(env STRIP)")
+    set_toolset("ranlib","$(env RANLIB)")
+    set_toolset("mm",    "$(env MM)")
+    set_toolset("mxx",   "$(env MXX)")
+    set_toolset("as",    "$(env AS)")
+    set_toolset("sc",    "$(env SC)")
 
diff --git a/xmake/toolchains/fasm/xmake.lua b/xmake/toolchains/fasm/xmake.lua
index 6b4dca86f..057479ece 100644
--- a/xmake/toolchains/fasm/xmake.lua
+++ b/xmake/toolchains/fasm/xmake.lua
@@ -25,8 +25,8 @@ toolchain("fasm")
     set_homepage("https://flatassembler.net/")
     set_description("Flat Assembler")
         
-    -- set toolsets
-    set_toolsets("as", "fasm")
+    -- set toolset
+    set_toolset("as", "fasm")
 
     -- on load
     on_load(function (toolchain)
diff --git a/xmake/toolchains/gcc/xmake.lua b/xmake/toolchains/gcc/xmake.lua
index 56d6864e6..ab12fd13a 100644
--- a/xmake/toolchains/gcc/xmake.lua
+++ b/xmake/toolchains/gcc/xmake.lua
@@ -28,17 +28,17 @@ toolchain("gcc")
     -- mark as standalone toolchain
     set_kind("standalone")
         
-    -- set toolsets
-    set_toolsets("cc", "gcc")
-    set_toolsets("cxx", "gcc", "g++")
-    set_toolsets("ld", "g++", "gcc")
-    set_toolsets("sh", "g++", "gcc")
-    set_toolsets("ar", "ar")
-    set_toolsets("ex", "ar")
-    set_toolsets("strip", "strip")
-    set_toolsets("mm", "gcc")
-    set_toolsets("mxx", "gcc", "g++")
-    set_toolsets("as", "gcc")
+    -- set toolset
+    set_toolset("cc", "gcc")
+    set_toolset("cxx", "gcc", "g++")
+    set_toolset("ld", "g++", "gcc")
+    set_toolset("sh", "g++", "gcc")
+    set_toolset("ar", "ar")
+    set_toolset("ex", "ar")
+    set_toolset("strip", "strip")
+    set_toolset("mm", "gcc")
+    set_toolset("mxx", "gcc", "g++")
+    set_toolset("as", "gcc")
 
     -- check toolchain
     on_check(function (toolchain)
diff --git a/xmake/toolchains/gnu-rm/xmake.lua b/xmake/toolchains/gnu-rm/xmake.lua
index b1ed0bc52..3c44666e5 100644
--- a/xmake/toolchains/gnu-rm/xmake.lua
+++ b/xmake/toolchains/gnu-rm/xmake.lua
@@ -40,17 +40,17 @@ toolchain("gnu-rm")
         -- get cross prefix
         local cross = config.get("cross") or ""
 
-        -- set toolsets
-        toolchain:set("toolsets", "cc", cross .. "gcc", cross .. "clang")
-        toolchain:set("toolsets", "cxx", cross .. "gcc", cross .. "clang", cross .. "g++", cross .. "clang++")
-        toolchain:set("toolsets", "cpp", cross .. "gcc -E", cross .. "clang -E")
-        toolchain:set("toolsets", "as", cross .. "gcc", cross .. "clang")
-        toolchain:set("toolsets", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
-        toolchain:set("toolsets", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
-        toolchain:set("toolsets", "ar", cross .. "ar")
-        toolchain:set("toolsets", "ex", cross .. "ar")
-        toolchain:set("toolsets", "ranlib", cross .. "ranlib")
-        toolchain:set("toolsets", "strip", cross .. "strip")
+        -- set toolset
+        toolchain:set("toolset", "cc", cross .. "gcc", cross .. "clang")
+        toolchain:set("toolset", "cxx", cross .. "gcc", cross .. "clang", cross .. "g++", cross .. "clang++")
+        toolchain:set("toolset", "cpp", cross .. "gcc -E", cross .. "clang -E")
+        toolchain:set("toolset", "as", cross .. "gcc", cross .. "clang")
+        toolchain:set("toolset", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolset", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolset", "ar", cross .. "ar")
+        toolchain:set("toolset", "ex", cross .. "ar")
+        toolchain:set("toolset", "ranlib", cross .. "ranlib")
+        toolchain:set("toolset", "strip", cross .. "strip")
 
         -- init linkdirs and includedirs
         local sdkdir = toolchain:sdkdir()
diff --git a/xmake/toolchains/go/xmake.lua b/xmake/toolchains/go/xmake.lua
index ec43f7073..39c253b57 100644
--- a/xmake/toolchains/go/xmake.lua
+++ b/xmake/toolchains/go/xmake.lua
@@ -25,10 +25,10 @@ toolchain("go")
     set_homepage("https://golang.org/")
     set_description("Go Programming Language Compiler")
         
-    -- set toolsets
-    set_toolsets("gc",   "$(env GC)", "go", "gccgo")
-    set_toolsets("gcld", "$(env GC)", "go", "gccgo")
-    set_toolsets("gcar", "$(env GC)", "go", "gccgo")
+    -- set toolset
+    set_toolset("gc",   "$(env GC)", "go", "gccgo")
+    set_toolset("gcld", "$(env GC)", "go", "gccgo")
+    set_toolset("gcar", "$(env GC)", "go", "gccgo")
 
     -- on load
     on_load(function (toolchain)
diff --git a/xmake/toolchains/llvm/xmake.lua b/xmake/toolchains/llvm/xmake.lua
index 74545ab9a..d4371682c 100644
--- a/xmake/toolchains/llvm/xmake.lua
+++ b/xmake/toolchains/llvm/xmake.lua
@@ -28,17 +28,17 @@ toolchain("llvm")
     -- mark as standalone toolchain
     set_kind("standalone")
 
-    -- set toolsets
-    set_toolsets("cc",     "clang")
-    set_toolsets("cxx",    "clang", "clang++")
-    set_toolsets("cpp",    "clang -E")
-    set_toolsets("as",     "clang")
-    set_toolsets("ld",     "clang++", "clang")
-    set_toolsets("sh",     "clang++", "clang")
-    set_toolsets("ar",     "llvm-ar")
-    set_toolsets("ex",     "llvm-ar")
-    set_toolsets("ranlib", "llvm-ranlib")
-    set_toolsets("strip",  "llvm-strip")
+    -- set toolset
+    set_toolset("cc",     "clang")
+    set_toolset("cxx",    "clang", "clang++")
+    set_toolset("cpp",    "clang -E")
+    set_toolset("as",     "clang")
+    set_toolset("ld",     "clang++", "clang")
+    set_toolset("sh",     "clang++", "clang")
+    set_toolset("ar",     "llvm-ar")
+    set_toolset("ex",     "llvm-ar")
+    set_toolset("ranlib", "llvm-ranlib")
+    set_toolset("strip",  "llvm-strip")
        
     -- check toolchain
     on_check("check")
diff --git a/xmake/toolchains/mingw/xmake.lua b/xmake/toolchains/mingw/xmake.lua
index a723bb7d5..2d246553a 100644
--- a/xmake/toolchains/mingw/xmake.lua
+++ b/xmake/toolchains/mingw/xmake.lua
@@ -53,25 +53,25 @@ toolchain("mingw")
             toolchain:add("runenvs", "PATH", bindir)
         end
 
-        -- set toolsets
+        -- set toolset
         if is_host("windows") and bindir then
             -- @note we uses bin/ar.exe instead of bin/cross-gcc-ar.exe, @see https://github.com/xmake-io/xmake/issues/807#issuecomment-635779210
-            toolchain:add("toolsets", "ar", path.join(bindir, "ar"))
-            toolchain:add("toolsets", "ex", path.join(bindir, "ar"))
-            toolchain:add("toolsets", "strip", path.join(bindir, "strip"))
-            toolchain:add("toolsets", "ranlib", path.join(bindir, "ranlib"))
+            toolchain:add("toolset", "ar", path.join(bindir, "ar"))
+            toolchain:add("toolset", "ex", path.join(bindir, "ar"))
+            toolchain:add("toolset", "strip", path.join(bindir, "strip"))
+            toolchain:add("toolset", "ranlib", path.join(bindir, "ranlib"))
         end
-        toolchain:add("toolsets", "cc", cross .. "gcc")
-        toolchain:add("toolsets", "cxx", cross .. "gcc", cross .. "g++")
-        toolchain:add("toolsets", "cpp", cross .. "gcc -E")
-        toolchain:add("toolsets", "as", cross .. "gcc")
-        toolchain:add("toolsets", "ld", cross .. "g++", cross .. "gcc")
-        toolchain:add("toolsets", "sh", cross .. "g++", cross .. "gcc")
-        toolchain:add("toolsets", "ar", cross .. "ar")
-        toolchain:add("toolsets", "ex", cross .. "ar")
-        toolchain:add("toolsets", "strip", cross .. "strip")
-        toolchain:add("toolsets", "ranlib", cross .. "ranlib")
-        toolchain:add("toolsets", "mrc", cross .. "windres")
+        toolchain:add("toolset", "cc", cross .. "gcc")
+        toolchain:add("toolset", "cxx", cross .. "gcc", cross .. "g++")
+        toolchain:add("toolset", "cpp", cross .. "gcc -E")
+        toolchain:add("toolset", "as", cross .. "gcc")
+        toolchain:add("toolset", "ld", cross .. "g++", cross .. "gcc")
+        toolchain:add("toolset", "sh", cross .. "g++", cross .. "gcc")
+        toolchain:add("toolset", "ar", cross .. "ar")
+        toolchain:add("toolset", "ex", cross .. "ar")
+        toolchain:add("toolset", "strip", cross .. "strip")
+        toolchain:add("toolset", "ranlib", cross .. "ranlib")
+        toolchain:add("toolset", "mrc", cross .. "windres")
 
         -- init flags for architecture
         local archflags = nil
diff --git a/xmake/toolchains/nasm/xmake.lua b/xmake/toolchains/nasm/xmake.lua
index e4017e8ef..164eaedd8 100644
--- a/xmake/toolchains/nasm/xmake.lua
+++ b/xmake/toolchains/nasm/xmake.lua
@@ -25,8 +25,8 @@ toolchain("nasm")
     set_homepage("https://www.nasm.us/")
     set_description("NASM Assembler")
         
-    -- set toolsets
-    set_toolsets("as", "nasm")
+    -- set toolset
+    set_toolset("as", "nasm")
 
     -- on load
     on_load(function (toolchain)
diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua
index b2b0ae95f..153a93f9b 100644
--- a/xmake/toolchains/ndk/load.lua
+++ b/xmake/toolchains/ndk/load.lua
@@ -34,17 +34,17 @@ function main(toolchain)
         gcc_toolchain_bin = path.join(gcc_toolchain, "bin")
     end
 
-    -- set toolsets
-    toolchain:set("toolsets", "cc", "clang", cross .. "gcc")
-    toolchain:set("toolsets", "cxx", "clang++", cross .. "g++")
-    toolchain:set("toolsets", "cpp", "clang -E", cross .. "gcc -E")
-    toolchain:set("toolsets", "as", "clang", cross .. "gcc")
-    toolchain:set("toolsets", "ld", "clang++", "clang", cross .. "g++", cross .. "gcc")
-    toolchain:set("toolsets", "sh", "clang++", "clang", cross .. "g++", cross .. "gcc")
-    toolchain:set("toolsets", "ar", gcc_toolchain_bin and path.join(gcc_toolchain_bin, cross .. "ar") or (cross .. "ar"), "llvm-ar")
-    toolchain:set("toolsets", "ex", gcc_toolchain_bin and path.join(gcc_toolchain_bin, cross .. "ar") or (cross .. "ar"), "llvm-ar")
-    toolchain:set("toolsets", "ranlib", gcc_toolchain_bin and path.join(gcc_toolchain_bin, cross .. "ranlib") or (cross .. "ranlib"))
-    toolchain:set("toolsets", "strip", gcc_toolchain_bin and path.join(gcc_toolchain_bin, cross .. "strip") or (cross .. "strip"))
+    -- set toolset
+    toolchain:set("toolset", "cc", "clang", cross .. "gcc")
+    toolchain:set("toolset", "cxx", "clang++", cross .. "g++")
+    toolchain:set("toolset", "cpp", "clang -E", cross .. "gcc -E")
+    toolchain:set("toolset", "as", "clang", cross .. "gcc")
+    toolchain:set("toolset", "ld", "clang++", "clang", cross .. "g++", cross .. "gcc")
+    toolchain:set("toolset", "sh", "clang++", "clang", cross .. "g++", cross .. "gcc")
+    toolchain:set("toolset", "ar", gcc_toolchain_bin and path.join(gcc_toolchain_bin, cross .. "ar") or (cross .. "ar"), "llvm-ar")
+    toolchain:set("toolset", "ex", gcc_toolchain_bin and path.join(gcc_toolchain_bin, cross .. "ar") or (cross .. "ar"), "llvm-ar")
+    toolchain:set("toolset", "ranlib", gcc_toolchain_bin and path.join(gcc_toolchain_bin, cross .. "ranlib") or (cross .. "ranlib"))
+    toolchain:set("toolset", "strip", gcc_toolchain_bin and path.join(gcc_toolchain_bin, cross .. "strip") or (cross .. "strip"))
 
     -- init flags
     local arm32 = false
diff --git a/xmake/toolchains/rust/xmake.lua b/xmake/toolchains/rust/xmake.lua
index 6112f3e96..f62f6b2b8 100644
--- a/xmake/toolchains/rust/xmake.lua
+++ b/xmake/toolchains/rust/xmake.lua
@@ -25,11 +25,11 @@ toolchain("rust")
     set_homepage("https://www.rust-lang.org/")
     set_description("Rust Programming Language Compiler")
         
-    -- set toolsets
-    set_toolsets("rc",   "$(env RC)", "rustc")
-    set_toolsets("rcld", "$(env RC)", "rustc")
-    set_toolsets("rcsh", "$(env RC)", "rustc")
-    set_toolsets("rcar", "$(env RC)", "rustc")
+    -- set toolset
+    set_toolset("rc",   "$(env RC)", "rustc")
+    set_toolset("rcld", "$(env RC)", "rustc")
+    set_toolset("rcsh", "$(env RC)", "rustc")
+    set_toolset("rcar", "$(env RC)", "rustc")
 
     -- on load
     on_load(function (toolchain)
diff --git a/xmake/toolchains/sdcc/xmake.lua b/xmake/toolchains/sdcc/xmake.lua
index bab1c8ac0..ce4862822 100644
--- a/xmake/toolchains/sdcc/xmake.lua
+++ b/xmake/toolchains/sdcc/xmake.lua
@@ -28,15 +28,15 @@ toolchain("sdcc")
     -- mark as standalone toolchain
     set_kind("standalone")
 
-    -- set toolsets
-    set_toolsets("cc",  "sdcc")
-    set_toolsets("cxx", "sdcc")
-    set_toolsets("cpp", "sdcpp")
-    set_toolsets("as",  "sdcc")
-    set_toolsets("ld",  "sdcc")
-    set_toolsets("sh",  "sdcc")
-    set_toolsets("ar",  "sdar")
-    set_toolsets("ex",  "sdar")
+    -- set toolset
+    set_toolset("cc",  "sdcc")
+    set_toolset("cxx", "sdcc")
+    set_toolset("cpp", "sdcpp")
+    set_toolset("as",  "sdcc")
+    set_toolset("ld",  "sdcc")
+    set_toolset("sh",  "sdcc")
+    set_toolset("ar",  "sdar")
+    set_toolset("ex",  "sdar")
 
     -- set archs
     set_archs("stm8", "mcs51", "z80", "z180", "r2k", "r3ka", "s08", "hc08")
diff --git a/xmake/toolchains/vs/load.lua b/xmake/toolchains/vs/load.lua
index 855869a0b..af32ca092 100644
--- a/xmake/toolchains/vs/load.lua
+++ b/xmake/toolchains/vs/load.lua
@@ -67,19 +67,19 @@ end
 -- main entry
 function main(toolchain)
 
-    -- set toolsets
-    toolchain:set("toolsets", "cc",  "cl.exe")
-    toolchain:set("toolsets", "cxx", "cl.exe")
-    toolchain:set("toolsets", "mrc", "rc.exe")
+    -- set toolset
+    toolchain:set("toolset", "cc",  "cl.exe")
+    toolchain:set("toolset", "cxx", "cl.exe")
+    toolchain:set("toolset", "mrc", "rc.exe")
     if is_arch("x64") then
-        toolchain:set("toolsets", "as",  "ml64.exe")
+        toolchain:set("toolset", "as",  "ml64.exe")
     else
-        toolchain:set("toolsets", "as",  "ml.exe")
+        toolchain:set("toolset", "as",  "ml.exe")
     end
-    toolchain:set("toolsets", "ld",  "link.exe")
-    toolchain:set("toolsets", "sh",  "link.exe -dll")
-    toolchain:set("toolsets", "ar",  "link.exe -lib")
-    toolchain:set("toolsets", "ex",  "lib.exe")
+    toolchain:set("toolset", "ld",  "link.exe")
+    toolchain:set("toolset", "sh",  "link.exe -dll")
+    toolchain:set("toolset", "ar",  "link.exe -lib")
+    toolchain:set("toolset", "ex",  "lib.exe")
 
     -- add vs environments
     _add_vsenv(toolchain, "path")
diff --git a/xmake/toolchains/xcode/xmake.lua b/xmake/toolchains/xcode/xmake.lua
index 0542dd19f..776c142af 100644
--- a/xmake/toolchains/xcode/xmake.lua
+++ b/xmake/toolchains/xcode/xmake.lua
@@ -50,29 +50,29 @@ toolchain("xcode")
             raise("unknown platform for xcode!")
         end
 
-        -- set toolsets
-        toolchain:set("toolsets", "cc", cross .. "clang")
-        toolchain:set("toolsets", "cxx", cross .. "clang", cross .. "clang++")
-        toolchain:set("toolsets", "ld", cross .. "clang++", cross .. "clang")
-        toolchain:set("toolsets", "sh", cross .. "clang++", cross .. "clang")
-        toolchain:set("toolsets", "ar", cross .. "ar")
-        toolchain:set("toolsets", "ex", cross .. "ar")
-        toolchain:set("toolsets", "strip", cross .. "strip")
-        toolchain:set("toolsets", "dsymutil", cross .. "dsymutil", "dsymutil")
-        toolchain:set("toolsets", "mm", cross .. "clang")
-        toolchain:set("toolsets", "mxx", cross .. "clang", cross .. "clang++")
-        toolchain:set("toolsets", "sc", cross .. "swiftc", "swiftc")
-        toolchain:set("toolsets", "scld", cross .. "swiftc", "swiftc")
-        toolchain:set("toolsets", "scsh", cross .. "swiftc", "swiftc")
+        -- set toolset
+        toolchain:set("toolset", "cc", cross .. "clang")
+        toolchain:set("toolset", "cxx", cross .. "clang", cross .. "clang++")
+        toolchain:set("toolset", "ld", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolset", "sh", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolset", "ar", cross .. "ar")
+        toolchain:set("toolset", "ex", cross .. "ar")
+        toolchain:set("toolset", "strip", cross .. "strip")
+        toolchain:set("toolset", "dsymutil", cross .. "dsymutil", "dsymutil")
+        toolchain:set("toolset", "mm", cross .. "clang")
+        toolchain:set("toolset", "mxx", cross .. "clang", cross .. "clang++")
+        toolchain:set("toolset", "sc", cross .. "swiftc", "swiftc")
+        toolchain:set("toolset", "scld", cross .. "swiftc", "swiftc")
+        toolchain:set("toolset", "scsh", cross .. "swiftc", "swiftc")
         if arch then
-            toolchain:set("toolsets", "cpp", cross .. "clang -arch " .. arch .. " -E")
+            toolchain:set("toolset", "cpp", cross .. "clang -arch " .. arch .. " -E")
         end
         if is_plat("macosx") then
-            toolchain:set("toolsets", "as", cross .. "clang")
+            toolchain:set("toolset", "as", cross .. "clang")
         elseif simulator then
-            toolchain:set("toolsets", "as", cross .. "clang")
+            toolchain:set("toolset", "as", cross .. "clang")
         else
-            toolchain:set("toolsets", "as", path.join(os.programdir(), "scripts", "gas-preprocessor.pl " .. cross) .. "clang")
+            toolchain:set("toolset", "as", path.join(os.programdir(), "scripts", "gas-preprocessor.pl " .. cross) .. "clang")
         end
 
         -- load configurations
diff --git a/xmake/toolchains/yasm/xmake.lua b/xmake/toolchains/yasm/xmake.lua
index 123895608..7811219b5 100644
--- a/xmake/toolchains/yasm/xmake.lua
+++ b/xmake/toolchains/yasm/xmake.lua
@@ -25,8 +25,8 @@ toolchain("yasm")
     set_homepage("https://yasm.tortall.net/")
     set_description("The Yasm Modular Assembler")
         
-    -- set toolsets
-    set_toolsets("as", "yasm")
+    -- set toolset
+    set_toolset("as", "yasm")
 
     -- on load
     on_load(function (toolchain)