remove ex kind

20 files changed, 3 insertions, 24 deletions

diff --git a/tests/apis/set_toolchains/xmake.lua b/tests/apis/set_toolchains/xmake.lua
index 83bdb4a5e..9db80f107 100644
--- a/tests/apis/set_toolchains/xmake.lua
+++ b/tests/apis/set_toolchains/xmake.lua
@@ -10,7 +10,6 @@ toolchain("myclang")
     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++")
diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua
index 2ff1dbc65..3779d9297 100644
--- a/xmake/core/tool/toolchain.lua
+++ b/xmake/core/tool/toolchain.lua
@@ -338,7 +338,6 @@ function _instance:_description(toolkind)
             ld         = "the linker",
             sh         = "the shared library linker",
             ar         = "the static library archiver",
-            ex         = "the static library extractor",
             mrc        = "the windows resource compiler",
             strip      = "the symbols stripper",
             dsymutil   = "the symbols generator",
diff --git a/xmake/rules/utils/merge_archive/merge_archive.lua b/xmake/rules/utils/merge_archive/merge_archive.lua
index c98fc6b31..02d572afc 100644
--- a/xmake/rules/utils/merge_archive/merge_archive.lua
+++ b/xmake/rules/utils/merge_archive/merge_archive.lua
@@ -93,11 +93,12 @@ end
 
 -- do extract
 function _extract(target, libraryfile, objectdir)
-    local program, toolname = target:tool("ex")
+    local program, toolname = target:tool("ar")
     if program and toolname then
         if toolname:find("ar") then
             _extract_for_ar(program, libraryfile, objectdir)
-        elseif toolname == "lib" then
+        elseif toolname == "link" then
+            program = program:replace("link.exe", "lib.exe", {plain = true})
             _extract_for_msvclib(program, libraryfile, objectdir)
         end
     else
diff --git a/xmake/toolchains/armcc/xmake.lua b/xmake/toolchains/armcc/xmake.lua
index 1b819bc48..f7c0fe837 100644
--- a/xmake/toolchains/armcc/xmake.lua
+++ b/xmake/toolchains/armcc/xmake.lua
@@ -29,7 +29,6 @@ toolchain("armcc")
     set_toolset("cxx", "armcc")
     set_toolset("ld", "armlink")
     set_toolset("ar", "armar")
-    set_toolset("ex", "armar")
     set_toolset("as", "armasm")
 
     on_check(function (toolchain)
diff --git a/xmake/toolchains/armclang/xmake.lua b/xmake/toolchains/armclang/xmake.lua
index bab9f582b..7faf06f0d 100644
--- a/xmake/toolchains/armclang/xmake.lua
+++ b/xmake/toolchains/armclang/xmake.lua
@@ -29,7 +29,6 @@ toolchain("armclang")
     set_toolset("cxx", "armclang")
     set_toolset("ld", "armlink")
     set_toolset("ar", "armar")
-    set_toolset("ex", "armar")
     set_toolset("as", "armasm")
 
     on_check(function (toolchain)
diff --git a/xmake/toolchains/circle/xmake.lua b/xmake/toolchains/circle/xmake.lua
index 2e5d84757..9f0416e83 100644
--- a/xmake/toolchains/circle/xmake.lua
+++ b/xmake/toolchains/circle/xmake.lua
@@ -30,7 +30,6 @@ toolchain("circle")
     set_toolset("ld", "circle")
     set_toolset("sh", "circle")
     set_toolset("ar", "ar")
-    set_toolset("ex", "ar")
     set_toolset("strip", "strip")
 
     on_check(function (toolchain)
diff --git a/xmake/toolchains/clang/xmake.lua b/xmake/toolchains/clang/xmake.lua
index ea4a45e30..96d22eac7 100644
--- a/xmake/toolchains/clang/xmake.lua
+++ b/xmake/toolchains/clang/xmake.lua
@@ -30,7 +30,6 @@ toolchain("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++")
diff --git a/xmake/toolchains/cross/load.lua b/xmake/toolchains/cross/load.lua
index 04d6f3044..dc0fd1b12 100644
--- a/xmake/toolchains/cross/load.lua
+++ b/xmake/toolchains/cross/load.lua
@@ -42,7 +42,6 @@ function main(toolchain)
     toolchain:add("toolset", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
     toolchain:add("toolset", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
     toolchain:add("toolset", "ar", cross .. "ar")
-    toolchain:add("toolset", "ex", cross .. "ar")
     toolchain:add("toolset", "ranlib", cross .. "ranlib")
     toolchain:add("toolset", "strip", cross .. "strip")
 
diff --git a/xmake/toolchains/emcc/xmake.lua b/xmake/toolchains/emcc/xmake.lua
index 2623fdf24..1379bd1c2 100644
--- a/xmake/toolchains/emcc/xmake.lua
+++ b/xmake/toolchains/emcc/xmake.lua
@@ -37,7 +37,6 @@ toolchain("emcc")
     set_toolset("ld", "em++" .. suffix, "emcc" .. suffix)
     set_toolset("sh", "em++" .. suffix, "emcc" .. suffix)
     set_toolset("ar", "emar" .. suffix)
-    set_toolset("ex", "emar" .. suffix)
     set_toolset("as", "emcc" .. suffix)
 
     -- check toolchain
diff --git a/xmake/toolchains/envs/xmake.lua b/xmake/toolchains/envs/xmake.lua
index 500eb38c6..b40cf6166 100644
--- a/xmake/toolchains/envs/xmake.lua
+++ b/xmake/toolchains/envs/xmake.lua
@@ -30,7 +30,6 @@ toolchain("envs")
     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)")
diff --git a/xmake/toolchains/gcc/xmake.lua b/xmake/toolchains/gcc/xmake.lua
index 28e58c4a2..365341eda 100644
--- a/xmake/toolchains/gcc/xmake.lua
+++ b/xmake/toolchains/gcc/xmake.lua
@@ -39,7 +39,6 @@ toolchain("gcc" .. suffix)
     set_toolset("ld", "g++" .. suffix, "gcc" .. suffix)
     set_toolset("sh", "g++" .. suffix, "gcc" .. suffix)
     set_toolset("ar", "ar")
-    set_toolset("ex", "ar")
     set_toolset("strip", "strip")
     set_toolset("mm", "gcc" .. suffix)
     set_toolset("mxx", "gcc" .. suffix, "g++" .. suffix)
diff --git a/xmake/toolchains/icc/load.lua b/xmake/toolchains/icc/load.lua
index e4cee9959..5784fc5c8 100644
--- a/xmake/toolchains/icc/load.lua
+++ b/xmake/toolchains/icc/load.lua
@@ -58,14 +58,12 @@ function _load_intel_on_windows(toolchain)
         toolchain:set("toolset", "ld",  "link.exe")
         toolchain:set("toolset", "sh",  "link.exe")
         toolchain:set("toolset", "ar",  "link.exe")
-        toolchain:set("toolset", "ex",  "lib.exe")
     else
         toolchain:set("toolset", "cc", "icc")
         toolchain:set("toolset", "cxx", "icpc", "icc")
         toolchain:set("toolset", "ld", "icpc", "icc")
         toolchain:set("toolset", "sh", "icpc", "icc")
         toolchain:set("toolset", "ar", "ar")
-        toolchain:set("toolset", "ex", "ar")
         toolchain:set("toolset", "strip", "strip")
         toolchain:set("toolset", "as", "icc")
     end
@@ -86,7 +84,6 @@ function _load_intel_on_linux(toolchain)
     toolchain:set("toolset", "ld", "icpc", "icc")
     toolchain:set("toolset", "sh", "icpc", "icc")
     toolchain:set("toolset", "ar", "ar")
-    toolchain:set("toolset", "ex", "ar")
     toolchain:set("toolset", "strip", "strip")
     toolchain:set("toolset", "as", "icc")
 
diff --git a/xmake/toolchains/ifort/load.lua b/xmake/toolchains/ifort/load.lua
index 8fa00c6ec..804f3a914 100644
--- a/xmake/toolchains/ifort/load.lua
+++ b/xmake/toolchains/ifort/load.lua
@@ -56,7 +56,6 @@ function _load_intel_on_windows(toolchain)
     toolchain:set("toolset", "fcld",  "ifort.exe")
     toolchain:set("toolset", "fcsh",  "ifort.exe")
     toolchain:set("toolset", "ar",  "link.exe")
-    toolchain:set("toolset", "ex",  "lib.exe")
 
     -- add ifort environments
     _add_ifortenv(toolchain, "PATH")
diff --git a/xmake/toolchains/llvm/xmake.lua b/xmake/toolchains/llvm/xmake.lua
index e08cb0e5d..40ec8fa92 100644
--- a/xmake/toolchains/llvm/xmake.lua
+++ b/xmake/toolchains/llvm/xmake.lua
@@ -36,7 +36,6 @@ toolchain("llvm")
     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")
 
diff --git a/xmake/toolchains/mingw/xmake.lua b/xmake/toolchains/mingw/xmake.lua
index 3ddd5c103..188b5ae8a 100644
--- a/xmake/toolchains/mingw/xmake.lua
+++ b/xmake/toolchains/mingw/xmake.lua
@@ -61,7 +61,6 @@ toolchain("mingw")
         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("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
@@ -72,7 +71,6 @@ toolchain("mingw")
         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")
diff --git a/xmake/toolchains/msvc/load.lua b/xmake/toolchains/msvc/load.lua
index 195815590..b6b9175f0 100644
--- a/xmake/toolchains/msvc/load.lua
+++ b/xmake/toolchains/msvc/load.lua
@@ -54,7 +54,6 @@ function main(toolchain)
     toolchain:set("toolset", "ld",  "link.exe")
     toolchain:set("toolset", "sh",  "link.exe")
     toolchain:set("toolset", "ar",  "link.exe")
-    toolchain:set("toolset", "ex",  "lib.exe")
 
     -- add vs environments
     _add_vsenv(toolchain, "PATH")
diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua
index 059f6b417..494558673 100644
--- a/xmake/toolchains/ndk/load.lua
+++ b/xmake/toolchains/ndk/load.lua
@@ -89,7 +89,6 @@ function main(toolchain)
     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"))
 
diff --git a/xmake/toolchains/sdcc/xmake.lua b/xmake/toolchains/sdcc/xmake.lua
index f196f916d..18dc595ff 100644
--- a/xmake/toolchains/sdcc/xmake.lua
+++ b/xmake/toolchains/sdcc/xmake.lua
@@ -36,7 +36,6 @@ toolchain("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/wasi/xmake.lua b/xmake/toolchains/wasi/xmake.lua
index de2b7f37e..9d6ec360c 100644
--- a/xmake/toolchains/wasi/xmake.lua
+++ b/xmake/toolchains/wasi/xmake.lua
@@ -36,7 +36,6 @@ toolchain("wasi")
     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")
 
diff --git a/xmake/toolchains/xcode/xmake.lua b/xmake/toolchains/xcode/xmake.lua
index b4d8c3d66..f2b2683ff 100644
--- a/xmake/toolchains/xcode/xmake.lua
+++ b/xmake/toolchains/xcode/xmake.lua
@@ -60,7 +60,6 @@ toolchain("xcode")
         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")