From 35677f50e4eb8ecb5aabe70e6ce900e28fd0adc2 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sat, 25 Jan 2025 00:59:17 +0800
Subject: [PATCH] move has_flags.lua

---
 tests/apis/custom_toolchain/3                 | Bin 0 -> 4606 bytes
 .../{detect => core}/tools/cl6x/has_flags.lua |   2 +-
 .../{detect => core}/tools/ar/has_flags.lua   |   2 +-
 .../core/tools/armasm64_msvc/has_flags.lua    |  23 ++++++++++++++++++
 .../tools/armasm_msvc/has_flags.lua           |   2 +-
 .../tools/armclang/has_flags.lua              |   2 +-
 .../icl => core/tools/circle}/has_flags.lua   |   2 +-
 .../{detect => core}/tools/cl/cfeatures.lua   |   0
 .../{detect => core}/tools/cl/cxxfeatures.lua |   0
 .../{detect => core}/tools/cl/features.lua    |   0
 .../{detect => core}/tools/cl/has_flags.lua   |   2 +-
 .../ml64 => core/tools/cl2000}/has_flags.lua  |   2 +-
 .../{detect => core}/tools/cl6x/has_flags.lua |   2 +-
 .../tools/clang/cfeatures.lua                 |   2 +-
 .../tools/clang/cxxfeatures.lua               |   2 +-
 .../{detect => core}/tools/clang/features.lua |   2 +-
 .../tools/clang}/has_flags.lua                |   2 +-
 .../tools/clang_cl/has_flags.lua              |   2 +-
 .../nvc => core/tools/clangxx}/features.lua   |   2 +-
 .../tools/clangxx}/has_flags.lua              |   2 +-
 .../tools/cosmocc/has_flags.lua               |   2 +-
 .../tools/cosmocxx}/has_flags.lua             |   2 +-
 .../{detect => core}/tools/dmd/has_flags.lua  |   2 +-
 .../tools/dpcpp/cfeatures.lua                 |   2 +-
 .../tools/dpcpp/cxxfeatures.lua               |   2 +-
 xmake/modules/core/tools/dpcpp/features.lua   |  22 +++++++++++++++++
 .../circle => core/tools/dpcpp}/has_flags.lua |   2 +-
 xmake/modules/core/tools/emcc/has_flags.lua   |  23 ++++++++++++++++++
 xmake/modules/core/tools/emxx/has_flags.lua   |  23 ++++++++++++++++++
 .../{detect => core}/tools/fpc/has_flags.lua  |   2 +-
 .../{detect => core}/tools/gcc/cfeatures.lua  |   0
 .../tools/gcc/cxxfeatures.lua                 |   0
 .../{detect => core}/tools/gcc/features.lua   |   0
 .../{detect => core}/tools/gcc/has_flags.lua  |   2 +-
 xmake/modules/core/tools/gccgo/has_flags.lua  |  23 ++++++++++++++++++
 .../{detect => core}/tools/gdc/has_flags.lua  |   2 +-
 .../tools/gfortran/has_flags.lua              |   2 +-
 .../{detect => core}/tools/go/has_flags.lua   |   2 +-
 .../{detect => core}/tools/gxx/features.lua   |   2 +-
 xmake/modules/core/tools/gxx/has_flags.lua    |  23 ++++++++++++++++++
 xmake/modules/core/tools/icc/has_flags.lua    |  23 ++++++++++++++++++
 xmake/modules/core/tools/icl/has_flags.lua    |  23 ++++++++++++++++++
 xmake/modules/core/tools/icpc/has_flags.lua   |  23 ++++++++++++++++++
 .../clangxx => core/tools/icpx}/features.lua  |   2 +-
 .../emcc => core/tools/icpx}/has_flags.lua    |   2 +-
 .../{detect => core}/tools/icx/cfeatures.lua  |   2 +-
 .../tools/icx/cxxfeatures.lua                 |   2 +-
 xmake/modules/core/tools/icx/features.lua     |  22 +++++++++++++++++
 xmake/modules/core/tools/icx/has_flags.lua    |  23 ++++++++++++++++++
 .../tools/ifort/has_flags.lua                 |   4 +--
 xmake/modules/core/tools/ifx/has_flags.lua    |  23 ++++++++++++++++++
 xmake/modules/core/tools/ldc2/has_flags.lua   |  23 ++++++++++++++++++
 .../{detect => core}/tools/link/has_flags.lua |   2 +-
 .../{detect => core}/tools/ml/has_flags.lua   |   2 +-
 xmake/modules/core/tools/ml64/has_flags.lua   |  23 ++++++++++++++++++
 .../{detect => core}/tools/nim/has_flags.lua  |   2 +-
 .../nvcxx => core/tools/nvc}/features.lua     |   2 +-
 xmake/modules/core/tools/nvc/has_flags.lua    |  23 ++++++++++++++++++
 .../{detect => core}/tools/nvcc/has_flags.lua |   2 +-
 xmake/modules/core/tools/nvcxx/features.lua   |  23 ++++++++++++++++++
 xmake/modules/core/tools/nvcxx/has_flags.lua  |  23 ++++++++++++++++++
 .../core/tools/nvfortran/has_flags.lua        |  23 ++++++++++++++++++
 .../{detect => core}/tools/rc/has_flags.lua   |   2 +-
 .../tools/rustc/has_flags.lua                 |   2 +-
 .../{detect => core}/tools/sdcc/has_flags.lua |   2 +-
 .../core/tools/swift_frontend/has_flags.lua   |  22 +++++++++++++++++
 .../tools/swiftc/has_flags.lua                |   2 +-
 xmake/modules/core/tools/tcc/has_flags.lua    |  23 ++++++++++++++++++
 .../{detect => core}/tools/zig/has_flags.lua  |   2 +-
 xmake/modules/core/tools/zig_cc/features.lua  |  23 ++++++++++++++++++
 xmake/modules/core/tools/zig_cc/has_flags.lua |  23 ++++++++++++++++++
 xmake/modules/core/tools/zig_cxx/features.lua |  23 ++++++++++++++++++
 .../modules/core/tools/zig_cxx/has_flags.lua  |  23 ++++++++++++++++++
 .../detect/tools/armasm64_msvc/has_flags.lua  |  23 ------------------
 .../detect/tools/cosmocxx/has_flags.lua       |  23 ------------------
 xmake/modules/detect/tools/dpcpp/features.lua |  22 -----------------
 .../modules/detect/tools/dpcpp/has_flags.lua  |  23 ------------------
 xmake/modules/detect/tools/emxx/has_flags.lua |  23 ------------------
 .../modules/detect/tools/gccgo/has_flags.lua  |  23 ------------------
 xmake/modules/detect/tools/gxx/has_flags.lua  |  23 ------------------
 xmake/modules/detect/tools/icc/has_flags.lua  |  23 ------------------
 xmake/modules/detect/tools/icpc/has_flags.lua |  23 ------------------
 xmake/modules/detect/tools/icpx/features.lua  |  23 ------------------
 xmake/modules/detect/tools/icpx/has_flags.lua |  23 ------------------
 xmake/modules/detect/tools/icx/features.lua   |  22 -----------------
 xmake/modules/detect/tools/icx/has_flags.lua  |  23 ------------------
 xmake/modules/detect/tools/ifx/has_flags.lua  |  23 ------------------
 xmake/modules/detect/tools/ldc2/has_flags.lua |  23 ------------------
 xmake/modules/detect/tools/nvc/has_flags.lua  |  23 ------------------
 .../modules/detect/tools/nvcxx/has_flags.lua  |  23 ------------------
 .../detect/tools/nvfortran/has_flags.lua      |  23 ------------------
 .../detect/tools/swift_frontend/has_flags.lua |  22 -----------------
 xmake/modules/detect/tools/tcc/has_flags.lua  |  23 ------------------
 .../modules/detect/tools/zig_cc/features.lua  |  23 ------------------
 .../modules/detect/tools/zig_cc/has_flags.lua |  23 ------------------
 .../modules/detect/tools/zig_cxx/features.lua |  23 ------------------
 .../detect/tools/zig_cxx/has_flags.lua        |  23 ------------------
 xmake/modules/lib/detect/features.lua         |   4 +--
 xmake/modules/lib/detect/has_flags.lua        |   4 +--
 99 files changed, 596 insertions(+), 596 deletions(-)
 create mode 100644 tests/apis/custom_toolchain/3
 rename tests/apis/custom_toolchain/toolchains/modules/{detect => core}/tools/cl6x/has_flags.lua (97%)
 rename xmake/modules/{detect => core}/tools/ar/has_flags.lua (98%)
 create mode 100644 xmake/modules/core/tools/armasm64_msvc/has_flags.lua
 rename xmake/modules/{detect => core}/tools/armasm_msvc/has_flags.lua (98%)
 rename xmake/modules/{detect => core}/tools/armclang/has_flags.lua (97%)
 rename xmake/modules/{detect/tools/icl => core/tools/circle}/has_flags.lua (95%)
 rename xmake/modules/{detect => core}/tools/cl/cfeatures.lua (100%)
 rename xmake/modules/{detect => core}/tools/cl/cxxfeatures.lua (100%)
 rename xmake/modules/{detect => core}/tools/cl/features.lua (100%)
 rename xmake/modules/{detect => core}/tools/cl/has_flags.lua (98%)
 rename xmake/modules/{detect/tools/ml64 => core/tools/cl2000}/has_flags.lua (95%)
 rename xmake/modules/{detect => core}/tools/cl6x/has_flags.lua (97%)
 rename xmake/modules/{detect => core}/tools/clang/cfeatures.lua (97%)
 rename xmake/modules/{detect => core}/tools/clang/cxxfeatures.lua (99%)
 rename xmake/modules/{detect => core}/tools/clang/features.lua (96%)
 rename xmake/modules/{detect/tools/clangxx => core/tools/clang}/has_flags.lua (95%)
 rename xmake/modules/{detect => core}/tools/clang_cl/has_flags.lua (98%)
 rename xmake/modules/{detect/tools/nvc => core/tools/clangxx}/features.lua (95%)
 rename xmake/modules/{detect/tools/clang => core/tools/clangxx}/has_flags.lua (95%)
 rename xmake/modules/{detect => core}/tools/cosmocc/has_flags.lua (98%)
 rename xmake/modules/{detect/tools/cl2000 => core/tools/cosmocxx}/has_flags.lua (94%)
 rename xmake/modules/{detect => core}/tools/dmd/has_flags.lua (98%)
 rename xmake/modules/{detect => core}/tools/dpcpp/cfeatures.lua (94%)
 rename xmake/modules/{detect => core}/tools/dpcpp/cxxfeatures.lua (94%)
 create mode 100644 xmake/modules/core/tools/dpcpp/features.lua
 rename xmake/modules/{detect/tools/circle => core/tools/dpcpp}/has_flags.lua (95%)
 create mode 100644 xmake/modules/core/tools/emcc/has_flags.lua
 create mode 100644 xmake/modules/core/tools/emxx/has_flags.lua
 rename xmake/modules/{detect => core}/tools/fpc/has_flags.lua (98%)
 rename xmake/modules/{detect => core}/tools/gcc/cfeatures.lua (100%)
 rename xmake/modules/{detect => core}/tools/gcc/cxxfeatures.lua (100%)
 rename xmake/modules/{detect => core}/tools/gcc/features.lua (100%)
 rename xmake/modules/{detect => core}/tools/gcc/has_flags.lua (98%)
 create mode 100644 xmake/modules/core/tools/gccgo/has_flags.lua
 rename xmake/modules/{detect => core}/tools/gdc/has_flags.lua (98%)
 rename xmake/modules/{detect => core}/tools/gfortran/has_flags.lua (98%)
 rename xmake/modules/{detect => core}/tools/go/has_flags.lua (98%)
 rename xmake/modules/{detect => core}/tools/gxx/features.lua (95%)
 create mode 100644 xmake/modules/core/tools/gxx/has_flags.lua
 create mode 100644 xmake/modules/core/tools/icc/has_flags.lua
 create mode 100644 xmake/modules/core/tools/icl/has_flags.lua
 create mode 100644 xmake/modules/core/tools/icpc/has_flags.lua
 rename xmake/modules/{detect/tools/clangxx => core/tools/icpx}/features.lua (95%)
 rename xmake/modules/{detect/tools/emcc => core/tools/icpx}/has_flags.lua (95%)
 rename xmake/modules/{detect => core}/tools/icx/cfeatures.lua (94%)
 rename xmake/modules/{detect => core}/tools/icx/cxxfeatures.lua (94%)
 create mode 100644 xmake/modules/core/tools/icx/features.lua
 create mode 100644 xmake/modules/core/tools/icx/has_flags.lua
 rename xmake/modules/{detect => core}/tools/ifort/has_flags.lua (89%)
 create mode 100644 xmake/modules/core/tools/ifx/has_flags.lua
 create mode 100644 xmake/modules/core/tools/ldc2/has_flags.lua
 rename xmake/modules/{detect => core}/tools/link/has_flags.lua (98%)
 rename xmake/modules/{detect => core}/tools/ml/has_flags.lua (98%)
 create mode 100644 xmake/modules/core/tools/ml64/has_flags.lua
 rename xmake/modules/{detect => core}/tools/nim/has_flags.lua (98%)
 rename xmake/modules/{detect/tools/nvcxx => core/tools/nvc}/features.lua (95%)
 create mode 100644 xmake/modules/core/tools/nvc/has_flags.lua
 rename xmake/modules/{detect => core}/tools/nvcc/has_flags.lua (99%)
 create mode 100644 xmake/modules/core/tools/nvcxx/features.lua
 create mode 100644 xmake/modules/core/tools/nvcxx/has_flags.lua
 create mode 100644 xmake/modules/core/tools/nvfortran/has_flags.lua
 rename xmake/modules/{detect => core}/tools/rc/has_flags.lua (97%)
 rename xmake/modules/{detect => core}/tools/rustc/has_flags.lua (98%)
 rename xmake/modules/{detect => core}/tools/sdcc/has_flags.lua (98%)
 create mode 100644 xmake/modules/core/tools/swift_frontend/has_flags.lua
 rename xmake/modules/{detect => core}/tools/swiftc/has_flags.lua (98%)
 create mode 100644 xmake/modules/core/tools/tcc/has_flags.lua
 rename xmake/modules/{detect => core}/tools/zig/has_flags.lua (98%)
 create mode 100644 xmake/modules/core/tools/zig_cc/features.lua
 create mode 100644 xmake/modules/core/tools/zig_cc/has_flags.lua
 create mode 100644 xmake/modules/core/tools/zig_cxx/features.lua
 create mode 100644 xmake/modules/core/tools/zig_cxx/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/armasm64_msvc/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/cosmocxx/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/dpcpp/features.lua
 delete mode 100644 xmake/modules/detect/tools/dpcpp/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/emxx/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/gccgo/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/gxx/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/icc/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/icpc/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/icpx/features.lua
 delete mode 100644 xmake/modules/detect/tools/icpx/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/icx/features.lua
 delete mode 100644 xmake/modules/detect/tools/icx/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/ifx/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/ldc2/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/nvc/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/nvcxx/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/nvfortran/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/swift_frontend/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/tcc/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/zig_cc/features.lua
 delete mode 100644 xmake/modules/detect/tools/zig_cc/has_flags.lua
 delete mode 100644 xmake/modules/detect/tools/zig_cxx/features.lua
 delete mode 100644 xmake/modules/detect/tools/zig_cxx/has_flags.lua

diff --git a/tests/apis/custom_toolchain/3 b/tests/apis/custom_toolchain/3
new file mode 100644
index 0000000000000000000000000000000000000000..51405a6f161e8681d5d30b2570bb55a389c3b084
GIT binary patch
literal 4606
zcmeHL&2!sC6ko|o;;Gw#4i}hqrh=xB7V5-Gnl#X_UHKzw<HWV)Ch3<d+lr&ck&G>;
zY558rZoPPh6E{x$0UUbb#0)163>R+PxbZhYd2d%r<i^8r>2S%;WcT;p{`UQzb~oF+
z{z#JKhv#26e>z6UBq8J^NgV%%B&EA2z!+#MSjo`yb8KcD@b^;85yIDDM1DGOb^;jH
z@CSyWZFfYt({<nL;(}QFZCLz-Afy|1U;{+0D8Ja!J-8e3Yuzq7|0^H43U*;LQiKf6
z2j(Mv{Pw7=0XPM_`*Mr+2mQatCX0Y~{)JCZ1Hm+ibP~pqMc3POIwYAqGII2-U0Hf6
zOJB*-udtUgkEzJrPJJ?Px<R_$ZVT7smKRL!Y}uO*pXg57ZMQpF?{x!z%L;tIRo}2(
z4>VM>See$Q^w}L%=%`iC-BGva(lcpoM%DfH<Br?h2-J!CSv501KYL!A%FL;zvtxHv
z15UBi+j6`Baoz8<{f-?t4I(Ku&>)hmbls-sG*po55NTBDc>|85@(5?FfXJgtcf;=h
z7}+O<o-xJs0;0qwxILC=`CgMG-<%jp?8S{-V+tZwn6Z^H@0haQ@@)vLC=I_?YdIvT
zh*f*0q<#ncDX9)z&Jn3Zr=Y({Gtif*27QH2LvPX<=&SSs^tb3N^ec1@`c--n`ZYQa
z{cW1T#dl~1SKp->Tz-#caQ%In!2lM`V1x$@i8e!CjUlbhkkw#Fau{;f8LBiHs%$V+
zaT%&SWL#yFag`S1DqD=Jc-ay#{0j7PU(NI3?UIhxJ4TtCr;U6W?eQgHpP?Dhk^Aq`
z3@FL{_h<&R<o*QBfSTMtOSLH+&ruDsmHY2g4f2)yA5aZ4miy<a206?9G}Rz$xj#uY
z9&d_jJYI%sJf2219&egX^LR6Kn#a4qg#IiO`g2U^Ut~gmo(cUAnb7};3H?h<=wD_+
z{|XcOSDDbi#)Lj)LZ30AuQQ>aWkNqki+n%wdWDY#LyQZC&TYfU@$tG*G5H4GFqZH;
z7niFhjzubXOEk-Q%Xyj=o>HDx1-h9p3Q#WOO9iq2m24Q;Ea!OKs#(z&G2$%%3kX)I
zIHFZ!kssk&IRv+}OVuJW?o>pwcMGM(HHw~lh!~>#rkJyg5Ik54ft?d6)N&%LI%L9g
zZ)A&=0<LxR5UgiSD_f)%&5EyUhIW>kTy7(@^(B+%?wWelij0S4GrMY)bNZfVlY3T+
z=ANg;J$jzYZixj^aF3fSk?D)sD3!LDjm(dW`EstnuU03^3RcCW{Cv8se8bA|BMTN*
zSZNBS@f&;GLbQ#DU&cp>H1zEt;urk!@~vEXk*=ZlNlCX#<>fr$PiVNEpPFL#J~MRz
zKF{XF)_;-BnXs{m{vVQV<X|UY)5u@&uTcC^U-y0frk{sbNcq3t^uq`6@Buu001qF)
zSNQ<?@X&=1;HYJph6R7=IUUb#y}CbD&vHo>dPyQLjzAA1wgZ1v!_)-$WpWDoA>`<_
z#>E)sH8PztpazhSONr#`qi>{6B+n$DU4!BxF-{W6RO)EzSn3LxiZBt5JpEE4@{t6T
z8KcL66fPJjv2cSDB1bM2b@8$aE1{vBSSf`i&rnXRe8P%t7zZ_@l4+E4uxL8iqB3cW
zbFff4*s#jM_V)`ynj8(Tx(vQZi%;_|@(A@!7@}4C96T;;gOSgHN91z}P!tDwqM;`N
z@kHd)FdY0e<op6|!3h_}hPvyySmD0lExOb*1D^I!&eZ`<Z7ApZ00#_G9q_~pa=b0#
zSIP#YhL%j6Skb=E*&N`+3vc{l5oa3^mchc~ymX@kXLo>;e(6TZ#Ih{#Sr*2@I|li9
z4H!ja;Q<af;~boS20w$l`t1SF^8wHJ0rfv&KHYF?y(T;`>wbh=uIIo*<CSy80&6W?
z<oHp2xy9TzX3P)OvJmpK6ObQ~fOX66G~ug|f!iw(-)RAHuR`ZOglDeZ?)dAL-wUh_
uuhGKg=tLi<bpsnp;{#szi9^O~J-5|J+d<HAYd!d1faqiFTCL-3lYao!;e|2)

literal 0
HcmV?d00001

diff --git a/tests/apis/custom_toolchain/toolchains/modules/detect/tools/cl6x/has_flags.lua b/tests/apis/custom_toolchain/toolchains/modules/core/tools/cl6x/has_flags.lua
similarity index 97%
rename from tests/apis/custom_toolchain/toolchains/modules/detect/tools/cl6x/has_flags.lua
rename to tests/apis/custom_toolchain/toolchains/modules/core/tools/cl6x/has_flags.lua
index d18d9b23375..a5f3f4b8788 100644
--- a/tests/apis/custom_toolchain/toolchains/modules/detect/tools/cl6x/has_flags.lua
+++ b/tests/apis/custom_toolchain/toolchains/modules/core/tools/cl6x/has_flags.lua
@@ -48,7 +48,7 @@ end
 
 -- attempt to check it from the argument list
 function _check_from_arglist(flags, opt, islinker)
-    local key = "detect.tools.cl6x." .. (islinker and "has_ldflags" or "has_cflags")
+    local key = "core.tools.cl6x." .. (islinker and "has_ldflags" or "has_cflags")
     local flagskey = opt.program .. "_" .. (opt.programver or "")
     local allflags = detectcache:get2(key, flagskey)
     if not allflags then
diff --git a/xmake/modules/detect/tools/ar/has_flags.lua b/xmake/modules/core/tools/ar/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/ar/has_flags.lua
rename to xmake/modules/core/tools/ar/has_flags.lua
index 914680d69e4..d4742e6e239 100644
--- a/xmake/modules/detect/tools/ar/has_flags.lua
+++ b/xmake/modules/core/tools/ar/has_flags.lua
@@ -30,7 +30,7 @@ function _check_from_arglist(flags, opt)
     end
 
     -- make cache key
-    local key = "detect.tools.ar.has_flags"
+    local key = "core.tools.ar.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/core/tools/armasm64_msvc/has_flags.lua b/xmake/modules/core/tools/armasm64_msvc/has_flags.lua
new file mode 100644
index 00000000000..8fbab3d9f9c
--- /dev/null
+++ b/xmake/modules/core/tools/armasm64_msvc/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.armasm_msvc.has_flags")
+
diff --git a/xmake/modules/detect/tools/armasm_msvc/has_flags.lua b/xmake/modules/core/tools/armasm_msvc/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/armasm_msvc/has_flags.lua
rename to xmake/modules/core/tools/armasm_msvc/has_flags.lua
index 4f1d4ee9772..f2aa5abed82 100644
--- a/xmake/modules/detect/tools/armasm_msvc/has_flags.lua
+++ b/xmake/modules/core/tools/armasm_msvc/has_flags.lua
@@ -30,7 +30,7 @@ function _check_from_arglist(flags, opt)
     end
 
     -- make cache key
-    local key = "detect.tools.armasm.has_flags"
+    local key = "core.tools.armasm.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/armclang/has_flags.lua b/xmake/modules/core/tools/armclang/has_flags.lua
similarity index 97%
rename from xmake/modules/detect/tools/armclang/has_flags.lua
rename to xmake/modules/core/tools/armclang/has_flags.lua
index d1a2fa75274..0c358e10a53 100644
--- a/xmake/modules/detect/tools/armclang/has_flags.lua
+++ b/xmake/modules/core/tools/armclang/has_flags.lua
@@ -55,7 +55,7 @@ end
 
 -- attempt to check it from the argument list
 function _check_from_arglist(flags, opt, islinker)
-    local key = "detect.tools.armclang." .. (islinker and "has_ldflags" or "has_cflags")
+    local key = "core.tools.armclang." .. (islinker and "has_ldflags" or "has_cflags")
     local flagskey = opt.program .. "_" .. (opt.programver or "")
     local allflags = detectcache:get2(key, flagskey)
     if not allflags then
diff --git a/xmake/modules/detect/tools/icl/has_flags.lua b/xmake/modules/core/tools/circle/has_flags.lua
similarity index 95%
rename from xmake/modules/detect/tools/icl/has_flags.lua
rename to xmake/modules/core/tools/circle/has_flags.lua
index eeba3941bed..76744a133dd 100644
--- a/xmake/modules/detect/tools/icl/has_flags.lua
+++ b/xmake/modules/core/tools/circle/has_flags.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.cl.has_flags")
+inherit("core.tools.gcc.has_flags")
 
diff --git a/xmake/modules/detect/tools/cl/cfeatures.lua b/xmake/modules/core/tools/cl/cfeatures.lua
similarity index 100%
rename from xmake/modules/detect/tools/cl/cfeatures.lua
rename to xmake/modules/core/tools/cl/cfeatures.lua
diff --git a/xmake/modules/detect/tools/cl/cxxfeatures.lua b/xmake/modules/core/tools/cl/cxxfeatures.lua
similarity index 100%
rename from xmake/modules/detect/tools/cl/cxxfeatures.lua
rename to xmake/modules/core/tools/cl/cxxfeatures.lua
diff --git a/xmake/modules/detect/tools/cl/features.lua b/xmake/modules/core/tools/cl/features.lua
similarity index 100%
rename from xmake/modules/detect/tools/cl/features.lua
rename to xmake/modules/core/tools/cl/features.lua
diff --git a/xmake/modules/detect/tools/cl/has_flags.lua b/xmake/modules/core/tools/cl/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/cl/has_flags.lua
rename to xmake/modules/core/tools/cl/has_flags.lua
index 378c16a5b85..d174d84e24b 100644
--- a/xmake/modules/detect/tools/cl/has_flags.lua
+++ b/xmake/modules/core/tools/cl/has_flags.lua
@@ -34,7 +34,7 @@ end
 
 -- attempt to check it from the argument list
 function _check_from_arglist(flags, opt)
-    local key = "detect.tools.cl.has_flags"
+    local key = "core.tools.cl.has_flags"
     local flagskey = opt.program .. "_" .. (opt.programver or "")
     local allflags = global_detectcache:get2(key, flagskey)
     if not allflags then
diff --git a/xmake/modules/detect/tools/ml64/has_flags.lua b/xmake/modules/core/tools/cl2000/has_flags.lua
similarity index 95%
rename from xmake/modules/detect/tools/ml64/has_flags.lua
rename to xmake/modules/core/tools/cl2000/has_flags.lua
index 259ac1e1dad..5d331d6b157 100644
--- a/xmake/modules/detect/tools/ml64/has_flags.lua
+++ b/xmake/modules/core/tools/cl2000/has_flags.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.ml.has_flags")
+inherit("core.tools.cl6x.has_flags")
 
diff --git a/xmake/modules/detect/tools/cl6x/has_flags.lua b/xmake/modules/core/tools/cl6x/has_flags.lua
similarity index 97%
rename from xmake/modules/detect/tools/cl6x/has_flags.lua
rename to xmake/modules/core/tools/cl6x/has_flags.lua
index d18d9b23375..a5f3f4b8788 100644
--- a/xmake/modules/detect/tools/cl6x/has_flags.lua
+++ b/xmake/modules/core/tools/cl6x/has_flags.lua
@@ -48,7 +48,7 @@ end
 
 -- attempt to check it from the argument list
 function _check_from_arglist(flags, opt, islinker)
-    local key = "detect.tools.cl6x." .. (islinker and "has_ldflags" or "has_cflags")
+    local key = "core.tools.cl6x." .. (islinker and "has_ldflags" or "has_cflags")
     local flagskey = opt.program .. "_" .. (opt.programver or "")
     local allflags = detectcache:get2(key, flagskey)
     if not allflags then
diff --git a/xmake/modules/detect/tools/clang/cfeatures.lua b/xmake/modules/core/tools/clang/cfeatures.lua
similarity index 97%
rename from xmake/modules/detect/tools/clang/cfeatures.lua
rename to xmake/modules/core/tools/clang/cfeatures.lua
index e9a1687a6fa..a6d10f6e168 100644
--- a/xmake/modules/detect/tools/clang/cfeatures.lua
+++ b/xmake/modules/core/tools/clang/cfeatures.lua
@@ -19,7 +19,7 @@
 --
 
 -- imports
-import("detect.tools.gcc.cfeatures")
+import("core.tools.gcc.cfeatures")
 
 -- set features
 function _set(feature, condition)
diff --git a/xmake/modules/detect/tools/clang/cxxfeatures.lua b/xmake/modules/core/tools/clang/cxxfeatures.lua
similarity index 99%
rename from xmake/modules/detect/tools/clang/cxxfeatures.lua
rename to xmake/modules/core/tools/clang/cxxfeatures.lua
index 1fd57c8d64b..4a98a1e7437 100644
--- a/xmake/modules/detect/tools/clang/cxxfeatures.lua
+++ b/xmake/modules/core/tools/clang/cxxfeatures.lua
@@ -19,7 +19,7 @@
 --
 
 -- imports
-import("detect.tools.gcc.cxxfeatures")
+import("core.tools.gcc.cxxfeatures")
 
 -- set features
 function _set(feature, condition)
diff --git a/xmake/modules/detect/tools/clang/features.lua b/xmake/modules/core/tools/clang/features.lua
similarity index 96%
rename from xmake/modules/detect/tools/clang/features.lua
rename to xmake/modules/core/tools/clang/features.lua
index b7562980f07..c2e2bf52351 100644
--- a/xmake/modules/detect/tools/clang/features.lua
+++ b/xmake/modules/core/tools/clang/features.lua
@@ -19,7 +19,7 @@
 --
 
 -- imports
-inherit("detect.tools.gcc.features")
+inherit("core.tools.gcc.features")
 import("cfeatures")
 import("cxxfeatures")
 
diff --git a/xmake/modules/detect/tools/clangxx/has_flags.lua b/xmake/modules/core/tools/clang/has_flags.lua
similarity index 95%
rename from xmake/modules/detect/tools/clangxx/has_flags.lua
rename to xmake/modules/core/tools/clang/has_flags.lua
index 6464e10b633..76744a133dd 100644
--- a/xmake/modules/detect/tools/clangxx/has_flags.lua
+++ b/xmake/modules/core/tools/clang/has_flags.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.gcc.has_flags")
+inherit("core.tools.gcc.has_flags")
 
diff --git a/xmake/modules/detect/tools/clang_cl/has_flags.lua b/xmake/modules/core/tools/clang_cl/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/clang_cl/has_flags.lua
rename to xmake/modules/core/tools/clang_cl/has_flags.lua
index 3f173dea4a9..56d83998aaa 100644
--- a/xmake/modules/detect/tools/clang_cl/has_flags.lua
+++ b/xmake/modules/core/tools/clang_cl/has_flags.lua
@@ -31,7 +31,7 @@ function _check_from_arglist(flags, opt)
     end
 
     -- make cache key
-    local key = "detect.tools.clang_cl.has_flags"
+    local key = "core.tools.clang_cl.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/nvc/features.lua b/xmake/modules/core/tools/clangxx/features.lua
similarity index 95%
rename from xmake/modules/detect/tools/nvc/features.lua
rename to xmake/modules/core/tools/clangxx/features.lua
index b887b9efcd1..08c822cfdca 100644
--- a/xmake/modules/detect/tools/nvc/features.lua
+++ b/xmake/modules/core/tools/clangxx/features.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.gcc.features")
+inherit("core.tools.gcc.features")
 
diff --git a/xmake/modules/detect/tools/clang/has_flags.lua b/xmake/modules/core/tools/clangxx/has_flags.lua
similarity index 95%
rename from xmake/modules/detect/tools/clang/has_flags.lua
rename to xmake/modules/core/tools/clangxx/has_flags.lua
index 6464e10b633..76744a133dd 100644
--- a/xmake/modules/detect/tools/clang/has_flags.lua
+++ b/xmake/modules/core/tools/clangxx/has_flags.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.gcc.has_flags")
+inherit("core.tools.gcc.has_flags")
 
diff --git a/xmake/modules/detect/tools/cosmocc/has_flags.lua b/xmake/modules/core/tools/cosmocc/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/cosmocc/has_flags.lua
rename to xmake/modules/core/tools/cosmocc/has_flags.lua
index df8690652f1..51a673a4e7a 100644
--- a/xmake/modules/detect/tools/cosmocc/has_flags.lua
+++ b/xmake/modules/core/tools/cosmocc/has_flags.lua
@@ -59,7 +59,7 @@ end
 
 -- attempt to check it from the argument list
 function _check_from_arglist(flags, opt, islinker)
-    local key = "detect.tools.cosmocc." .. (islinker and "has_ldflags" or "has_cflags")
+    local key = "core.tools.cosmocc." .. (islinker and "has_ldflags" or "has_cflags")
     local flagskey = opt.program .. "_" .. (opt.programver or "")
     local allflags = detectcache:get2(key, flagskey)
     if not allflags then
diff --git a/xmake/modules/detect/tools/cl2000/has_flags.lua b/xmake/modules/core/tools/cosmocxx/has_flags.lua
similarity index 94%
rename from xmake/modules/detect/tools/cl2000/has_flags.lua
rename to xmake/modules/core/tools/cosmocxx/has_flags.lua
index 4b108a611e4..3181c06479b 100644
--- a/xmake/modules/detect/tools/cl2000/has_flags.lua
+++ b/xmake/modules/core/tools/cosmocxx/has_flags.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.cl6x.has_flags")
+inherit("core.tools.cosmocc.has_flags")
 
diff --git a/xmake/modules/detect/tools/dmd/has_flags.lua b/xmake/modules/core/tools/dmd/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/dmd/has_flags.lua
rename to xmake/modules/core/tools/dmd/has_flags.lua
index 235e99d4cf6..c69c2716614 100644
--- a/xmake/modules/detect/tools/dmd/has_flags.lua
+++ b/xmake/modules/core/tools/dmd/has_flags.lua
@@ -52,7 +52,7 @@ function _check_from_arglist(flags, opt, islinker)
     end
 
     -- make cache key
-    local key = "detect.tools.dmd.has_flags"
+    local key = "core.tools.dmd.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/dpcpp/cfeatures.lua b/xmake/modules/core/tools/dpcpp/cfeatures.lua
similarity index 94%
rename from xmake/modules/detect/tools/dpcpp/cfeatures.lua
rename to xmake/modules/core/tools/dpcpp/cfeatures.lua
index 161f91c05eb..9cc3928ce36 100644
--- a/xmake/modules/detect/tools/dpcpp/cfeatures.lua
+++ b/xmake/modules/core/tools/dpcpp/cfeatures.lua
@@ -19,4 +19,4 @@
 --
 
 -- imports
-import("detect.tools.clang.cfeatures")
+import("core.tools.clang.cfeatures")
diff --git a/xmake/modules/detect/tools/dpcpp/cxxfeatures.lua b/xmake/modules/core/tools/dpcpp/cxxfeatures.lua
similarity index 94%
rename from xmake/modules/detect/tools/dpcpp/cxxfeatures.lua
rename to xmake/modules/core/tools/dpcpp/cxxfeatures.lua
index cf7f8d08e50..4c779fbb838 100644
--- a/xmake/modules/detect/tools/dpcpp/cxxfeatures.lua
+++ b/xmake/modules/core/tools/dpcpp/cxxfeatures.lua
@@ -19,4 +19,4 @@
 --
 
 -- imports
-import("detect.tools.clang.cxxfeatures")
+import("core.tools.clang.cxxfeatures")
diff --git a/xmake/modules/core/tools/dpcpp/features.lua b/xmake/modules/core/tools/dpcpp/features.lua
new file mode 100644
index 00000000000..8c04a299cc2
--- /dev/null
+++ b/xmake/modules/core/tools/dpcpp/features.lua
@@ -0,0 +1,22 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        features.lua
+--
+
+-- imports
+inherit("core.tools.clang.features")
diff --git a/xmake/modules/detect/tools/circle/has_flags.lua b/xmake/modules/core/tools/dpcpp/has_flags.lua
similarity index 95%
rename from xmake/modules/detect/tools/circle/has_flags.lua
rename to xmake/modules/core/tools/dpcpp/has_flags.lua
index 6464e10b633..284736424f3 100644
--- a/xmake/modules/detect/tools/circle/has_flags.lua
+++ b/xmake/modules/core/tools/dpcpp/has_flags.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.gcc.has_flags")
+inherit("core.tools.clang.has_flags")
 
diff --git a/xmake/modules/core/tools/emcc/has_flags.lua b/xmake/modules/core/tools/emcc/has_flags.lua
new file mode 100644
index 00000000000..76744a133dd
--- /dev/null
+++ b/xmake/modules/core/tools/emcc/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gcc.has_flags")
+
diff --git a/xmake/modules/core/tools/emxx/has_flags.lua b/xmake/modules/core/tools/emxx/has_flags.lua
new file mode 100644
index 00000000000..b4d6369d654
--- /dev/null
+++ b/xmake/modules/core/tools/emxx/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.emcc.has_flags")
+
diff --git a/xmake/modules/detect/tools/fpc/has_flags.lua b/xmake/modules/core/tools/fpc/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/fpc/has_flags.lua
rename to xmake/modules/core/tools/fpc/has_flags.lua
index 109e1014b77..8c4e6808603 100644
--- a/xmake/modules/detect/tools/fpc/has_flags.lua
+++ b/xmake/modules/core/tools/fpc/has_flags.lua
@@ -38,7 +38,7 @@ function _check_from_arglist(flags, opt)
     end
 
     -- make cache key
-    local key = "detect.tools.fpc.has_flags"
+    local key = "core.tools.fpc.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/gcc/cfeatures.lua b/xmake/modules/core/tools/gcc/cfeatures.lua
similarity index 100%
rename from xmake/modules/detect/tools/gcc/cfeatures.lua
rename to xmake/modules/core/tools/gcc/cfeatures.lua
diff --git a/xmake/modules/detect/tools/gcc/cxxfeatures.lua b/xmake/modules/core/tools/gcc/cxxfeatures.lua
similarity index 100%
rename from xmake/modules/detect/tools/gcc/cxxfeatures.lua
rename to xmake/modules/core/tools/gcc/cxxfeatures.lua
diff --git a/xmake/modules/detect/tools/gcc/features.lua b/xmake/modules/core/tools/gcc/features.lua
similarity index 100%
rename from xmake/modules/detect/tools/gcc/features.lua
rename to xmake/modules/core/tools/gcc/features.lua
diff --git a/xmake/modules/detect/tools/gcc/has_flags.lua b/xmake/modules/core/tools/gcc/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/gcc/has_flags.lua
rename to xmake/modules/core/tools/gcc/has_flags.lua
index 181cef04e7f..25d08be01e7 100644
--- a/xmake/modules/detect/tools/gcc/has_flags.lua
+++ b/xmake/modules/core/tools/gcc/has_flags.lua
@@ -56,7 +56,7 @@ end
 
 -- attempt to check it from the argument list
 function _check_from_arglist(flags, opt, islinker)
-    local key = "detect.tools.gcc." .. (islinker and "has_ldflags" or "has_cflags")
+    local key = "core.tools.gcc." .. (islinker and "has_ldflags" or "has_cflags")
     local flagskey = opt.program .. "_" .. (opt.programver or "")
     local allflags = detectcache:get2(key, flagskey)
     if not allflags then
diff --git a/xmake/modules/core/tools/gccgo/has_flags.lua b/xmake/modules/core/tools/gccgo/has_flags.lua
new file mode 100644
index 00000000000..76744a133dd
--- /dev/null
+++ b/xmake/modules/core/tools/gccgo/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gcc.has_flags")
+
diff --git a/xmake/modules/detect/tools/gdc/has_flags.lua b/xmake/modules/core/tools/gdc/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/gdc/has_flags.lua
rename to xmake/modules/core/tools/gdc/has_flags.lua
index 1ba8c98b0ca..e4cc32f6590 100644
--- a/xmake/modules/detect/tools/gdc/has_flags.lua
+++ b/xmake/modules/core/tools/gdc/has_flags.lua
@@ -51,7 +51,7 @@ function _check_from_arglist(flags, opt, islinker)
     end
 
     -- make cache key
-    local key = "detect.tools.gdc.has_flags"
+    local key = "core.tools.gdc.has_flags"
 
     -- make flags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/gfortran/has_flags.lua b/xmake/modules/core/tools/gfortran/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/gfortran/has_flags.lua
rename to xmake/modules/core/tools/gfortran/has_flags.lua
index 62a35c65366..3552d4d4506 100644
--- a/xmake/modules/detect/tools/gfortran/has_flags.lua
+++ b/xmake/modules/core/tools/gfortran/has_flags.lua
@@ -51,7 +51,7 @@ function _check_from_arglist(flags, opt, islinker)
     end
 
     -- make cache key
-    local key = "detect.tools.gfortran.has_flags"
+    local key = "core.tools.gfortran.has_flags"
 
     -- make flags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/go/has_flags.lua b/xmake/modules/core/tools/go/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/go/has_flags.lua
rename to xmake/modules/core/tools/go/has_flags.lua
index e1acf376925..bf96a1f1fc8 100644
--- a/xmake/modules/detect/tools/go/has_flags.lua
+++ b/xmake/modules/core/tools/go/has_flags.lua
@@ -47,7 +47,7 @@ function _check_from_arglist(flags, opt, islinker)
     end
 
     -- make cache key
-    local key = "detect.tools.go.has_flags"
+    local key = "core.tools.go.has_flags"
 
     -- make flags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/gxx/features.lua b/xmake/modules/core/tools/gxx/features.lua
similarity index 95%
rename from xmake/modules/detect/tools/gxx/features.lua
rename to xmake/modules/core/tools/gxx/features.lua
index b887b9efcd1..08c822cfdca 100644
--- a/xmake/modules/detect/tools/gxx/features.lua
+++ b/xmake/modules/core/tools/gxx/features.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.gcc.features")
+inherit("core.tools.gcc.features")
 
diff --git a/xmake/modules/core/tools/gxx/has_flags.lua b/xmake/modules/core/tools/gxx/has_flags.lua
new file mode 100644
index 00000000000..76744a133dd
--- /dev/null
+++ b/xmake/modules/core/tools/gxx/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gcc.has_flags")
+
diff --git a/xmake/modules/core/tools/icc/has_flags.lua b/xmake/modules/core/tools/icc/has_flags.lua
new file mode 100644
index 00000000000..76744a133dd
--- /dev/null
+++ b/xmake/modules/core/tools/icc/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gcc.has_flags")
+
diff --git a/xmake/modules/core/tools/icl/has_flags.lua b/xmake/modules/core/tools/icl/has_flags.lua
new file mode 100644
index 00000000000..ab189dfd061
--- /dev/null
+++ b/xmake/modules/core/tools/icl/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.cl.has_flags")
+
diff --git a/xmake/modules/core/tools/icpc/has_flags.lua b/xmake/modules/core/tools/icpc/has_flags.lua
new file mode 100644
index 00000000000..a2d18c48f3e
--- /dev/null
+++ b/xmake/modules/core/tools/icpc/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gxx.has_flags")
+
diff --git a/xmake/modules/detect/tools/clangxx/features.lua b/xmake/modules/core/tools/icpx/features.lua
similarity index 95%
rename from xmake/modules/detect/tools/clangxx/features.lua
rename to xmake/modules/core/tools/icpx/features.lua
index b887b9efcd1..7628827f1ac 100644
--- a/xmake/modules/detect/tools/clangxx/features.lua
+++ b/xmake/modules/core/tools/icpx/features.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.gcc.features")
+inherit("core.tools.clang.features")
 
diff --git a/xmake/modules/detect/tools/emcc/has_flags.lua b/xmake/modules/core/tools/icpx/has_flags.lua
similarity index 95%
rename from xmake/modules/detect/tools/emcc/has_flags.lua
rename to xmake/modules/core/tools/icpx/has_flags.lua
index 6464e10b633..284736424f3 100644
--- a/xmake/modules/detect/tools/emcc/has_flags.lua
+++ b/xmake/modules/core/tools/icpx/has_flags.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.gcc.has_flags")
+inherit("core.tools.clang.has_flags")
 
diff --git a/xmake/modules/detect/tools/icx/cfeatures.lua b/xmake/modules/core/tools/icx/cfeatures.lua
similarity index 94%
rename from xmake/modules/detect/tools/icx/cfeatures.lua
rename to xmake/modules/core/tools/icx/cfeatures.lua
index 161f91c05eb..9cc3928ce36 100644
--- a/xmake/modules/detect/tools/icx/cfeatures.lua
+++ b/xmake/modules/core/tools/icx/cfeatures.lua
@@ -19,4 +19,4 @@
 --
 
 -- imports
-import("detect.tools.clang.cfeatures")
+import("core.tools.clang.cfeatures")
diff --git a/xmake/modules/detect/tools/icx/cxxfeatures.lua b/xmake/modules/core/tools/icx/cxxfeatures.lua
similarity index 94%
rename from xmake/modules/detect/tools/icx/cxxfeatures.lua
rename to xmake/modules/core/tools/icx/cxxfeatures.lua
index cf7f8d08e50..4c779fbb838 100644
--- a/xmake/modules/detect/tools/icx/cxxfeatures.lua
+++ b/xmake/modules/core/tools/icx/cxxfeatures.lua
@@ -19,4 +19,4 @@
 --
 
 -- imports
-import("detect.tools.clang.cxxfeatures")
+import("core.tools.clang.cxxfeatures")
diff --git a/xmake/modules/core/tools/icx/features.lua b/xmake/modules/core/tools/icx/features.lua
new file mode 100644
index 00000000000..8c04a299cc2
--- /dev/null
+++ b/xmake/modules/core/tools/icx/features.lua
@@ -0,0 +1,22 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        features.lua
+--
+
+-- imports
+inherit("core.tools.clang.features")
diff --git a/xmake/modules/core/tools/icx/has_flags.lua b/xmake/modules/core/tools/icx/has_flags.lua
new file mode 100644
index 00000000000..284736424f3
--- /dev/null
+++ b/xmake/modules/core/tools/icx/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.clang.has_flags")
+
diff --git a/xmake/modules/detect/tools/ifort/has_flags.lua b/xmake/modules/core/tools/ifort/has_flags.lua
similarity index 89%
rename from xmake/modules/detect/tools/ifort/has_flags.lua
rename to xmake/modules/core/tools/ifort/has_flags.lua
index 86a5048671e..df3acfe3ebe 100644
--- a/xmake/modules/detect/tools/ifort/has_flags.lua
+++ b/xmake/modules/core/tools/ifort/has_flags.lua
@@ -20,8 +20,8 @@
 
 -- imports
 if is_host("windows") then
-    inherit("detect.tools.cl.has_flags")
+    inherit("core.tools.cl.has_flags")
 else
-    inherit("detect.tools.gfortran.has_flags")
+    inherit("core.tools.gfortran.has_flags")
 end
 
diff --git a/xmake/modules/core/tools/ifx/has_flags.lua b/xmake/modules/core/tools/ifx/has_flags.lua
new file mode 100644
index 00000000000..d1f745651bb
--- /dev/null
+++ b/xmake/modules/core/tools/ifx/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.ifort.has_flags")
+
diff --git a/xmake/modules/core/tools/ldc2/has_flags.lua b/xmake/modules/core/tools/ldc2/has_flags.lua
new file mode 100644
index 00000000000..81dd1e94a40
--- /dev/null
+++ b/xmake/modules/core/tools/ldc2/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.dmd.has_flags")
+
diff --git a/xmake/modules/detect/tools/link/has_flags.lua b/xmake/modules/core/tools/link/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/link/has_flags.lua
rename to xmake/modules/core/tools/link/has_flags.lua
index 6b0cf48f853..1f93b79797d 100644
--- a/xmake/modules/detect/tools/link/has_flags.lua
+++ b/xmake/modules/core/tools/link/has_flags.lua
@@ -30,7 +30,7 @@ end
 
 -- attempt to check it from the argument list
 function _check_from_arglist(flags, opt)
-    local key = "detect.tools.link.has_flags"
+    local key = "core.tools.link.has_flags"
     local flagskey = opt.program .. "_" .. (opt.programver or "")
     local allflags = global_detectcache:get2(key, flagskey)
     if not allflags then
diff --git a/xmake/modules/detect/tools/ml/has_flags.lua b/xmake/modules/core/tools/ml/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/ml/has_flags.lua
rename to xmake/modules/core/tools/ml/has_flags.lua
index 0dbda2134ca..6eeb4e76815 100644
--- a/xmake/modules/detect/tools/ml/has_flags.lua
+++ b/xmake/modules/core/tools/ml/has_flags.lua
@@ -30,7 +30,7 @@ function _check_from_arglist(flags, opt)
     end
 
     -- make cache key
-    local key = "detect.tools.ml.has_flags"
+    local key = "core.tools.ml.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/core/tools/ml64/has_flags.lua b/xmake/modules/core/tools/ml64/has_flags.lua
new file mode 100644
index 00000000000..323fd4d5ee1
--- /dev/null
+++ b/xmake/modules/core/tools/ml64/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.ml.has_flags")
+
diff --git a/xmake/modules/detect/tools/nim/has_flags.lua b/xmake/modules/core/tools/nim/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/nim/has_flags.lua
rename to xmake/modules/core/tools/nim/has_flags.lua
index 5538257fbb2..84ce412b788 100644
--- a/xmake/modules/detect/tools/nim/has_flags.lua
+++ b/xmake/modules/core/tools/nim/has_flags.lua
@@ -38,7 +38,7 @@ function _check_from_arglist(flags, opt)
     end
 
     -- make cache key
-    local key = "detect.tools.nim.has_flags"
+    local key = "core.tools.nim.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/nvcxx/features.lua b/xmake/modules/core/tools/nvc/features.lua
similarity index 95%
rename from xmake/modules/detect/tools/nvcxx/features.lua
rename to xmake/modules/core/tools/nvc/features.lua
index b887b9efcd1..08c822cfdca 100644
--- a/xmake/modules/detect/tools/nvcxx/features.lua
+++ b/xmake/modules/core/tools/nvc/features.lua
@@ -19,5 +19,5 @@
 --
 
 -- imports
-inherit("detect.tools.gcc.features")
+inherit("core.tools.gcc.features")
 
diff --git a/xmake/modules/core/tools/nvc/has_flags.lua b/xmake/modules/core/tools/nvc/has_flags.lua
new file mode 100644
index 00000000000..76744a133dd
--- /dev/null
+++ b/xmake/modules/core/tools/nvc/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gcc.has_flags")
+
diff --git a/xmake/modules/detect/tools/nvcc/has_flags.lua b/xmake/modules/core/tools/nvcc/has_flags.lua
similarity index 99%
rename from xmake/modules/detect/tools/nvcc/has_flags.lua
rename to xmake/modules/core/tools/nvcc/has_flags.lua
index ff1c47b422d..347961e7046 100644
--- a/xmake/modules/detect/tools/nvcc/has_flags.lua
+++ b/xmake/modules/core/tools/nvcc/has_flags.lua
@@ -72,7 +72,7 @@ function _check_from_arglist(flags, opt, islinker)
     end
 
     -- make cache key
-    local key = "detect.tools.nvcc.has_flags"
+    local key = "core.tools.nvcc.has_flags"
 
     -- make flags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/core/tools/nvcxx/features.lua b/xmake/modules/core/tools/nvcxx/features.lua
new file mode 100644
index 00000000000..08c822cfdca
--- /dev/null
+++ b/xmake/modules/core/tools/nvcxx/features.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        features.lua
+--
+
+-- imports
+inherit("core.tools.gcc.features")
+
diff --git a/xmake/modules/core/tools/nvcxx/has_flags.lua b/xmake/modules/core/tools/nvcxx/has_flags.lua
new file mode 100644
index 00000000000..76744a133dd
--- /dev/null
+++ b/xmake/modules/core/tools/nvcxx/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gcc.has_flags")
+
diff --git a/xmake/modules/core/tools/nvfortran/has_flags.lua b/xmake/modules/core/tools/nvfortran/has_flags.lua
new file mode 100644
index 00000000000..d0447806fae
--- /dev/null
+++ b/xmake/modules/core/tools/nvfortran/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gfortran.has_flags")
+
diff --git a/xmake/modules/detect/tools/rc/has_flags.lua b/xmake/modules/core/tools/rc/has_flags.lua
similarity index 97%
rename from xmake/modules/detect/tools/rc/has_flags.lua
rename to xmake/modules/core/tools/rc/has_flags.lua
index ac023c466db..a635a3f68d1 100644
--- a/xmake/modules/detect/tools/rc/has_flags.lua
+++ b/xmake/modules/core/tools/rc/has_flags.lua
@@ -31,7 +31,7 @@ function _check_from_arglist(flags, opt)
     end
 
     -- make cache key
-    local key = "detect.tools.rc.has_flags"
+    local key = "core.tools.rc.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/rustc/has_flags.lua b/xmake/modules/core/tools/rustc/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/rustc/has_flags.lua
rename to xmake/modules/core/tools/rustc/has_flags.lua
index e1696e45436..9072b1c35cd 100644
--- a/xmake/modules/detect/tools/rustc/has_flags.lua
+++ b/xmake/modules/core/tools/rustc/has_flags.lua
@@ -48,7 +48,7 @@ function _check_from_arglist(flags, opt)
     end
 
     -- make cache key
-    local key = "detect.tools.rustc.has_flags"
+    local key = "core.tools.rustc.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/detect/tools/sdcc/has_flags.lua b/xmake/modules/core/tools/sdcc/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/sdcc/has_flags.lua
rename to xmake/modules/core/tools/sdcc/has_flags.lua
index 18c0eb3aedc..e960fa8e195 100644
--- a/xmake/modules/detect/tools/sdcc/has_flags.lua
+++ b/xmake/modules/core/tools/sdcc/has_flags.lua
@@ -53,7 +53,7 @@ function _check_from_arglist(flags, opt, islinker)
     end
 
     -- make cache key
-    local key = "detect.tools.sdcc.has_flags"
+    local key = "core.tools.sdcc.has_flags"
 
     -- make flags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/core/tools/swift_frontend/has_flags.lua b/xmake/modules/core/tools/swift_frontend/has_flags.lua
new file mode 100644
index 00000000000..eecb0ede767
--- /dev/null
+++ b/xmake/modules/core/tools/swift_frontend/has_flags.lua
@@ -0,0 +1,22 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.swiftc.has_flags")
diff --git a/xmake/modules/detect/tools/swiftc/has_flags.lua b/xmake/modules/core/tools/swiftc/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/swiftc/has_flags.lua
rename to xmake/modules/core/tools/swiftc/has_flags.lua
index 99b36de754e..cf56da7c573 100644
--- a/xmake/modules/detect/tools/swiftc/has_flags.lua
+++ b/xmake/modules/core/tools/swiftc/has_flags.lua
@@ -37,7 +37,7 @@ function _check_from_arglist(flags, opt)
     end
 
     -- make cache key
-    local key = "detect.tools.swiftc.has_flags"
+    local key = "core.tools.swiftc.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/core/tools/tcc/has_flags.lua b/xmake/modules/core/tools/tcc/has_flags.lua
new file mode 100644
index 00000000000..76744a133dd
--- /dev/null
+++ b/xmake/modules/core/tools/tcc/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gcc.has_flags")
+
diff --git a/xmake/modules/detect/tools/zig/has_flags.lua b/xmake/modules/core/tools/zig/has_flags.lua
similarity index 98%
rename from xmake/modules/detect/tools/zig/has_flags.lua
rename to xmake/modules/core/tools/zig/has_flags.lua
index 1dea91cfe0f..92aeb5c7234 100644
--- a/xmake/modules/detect/tools/zig/has_flags.lua
+++ b/xmake/modules/core/tools/zig/has_flags.lua
@@ -46,7 +46,7 @@ function _check_from_arglist(flags, opt, islinker)
     end
 
     -- make cache key
-    local key = "detect.tools.zig.has_flags"
+    local key = "core.tools.zig.has_flags"
 
     -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
diff --git a/xmake/modules/core/tools/zig_cc/features.lua b/xmake/modules/core/tools/zig_cc/features.lua
new file mode 100644
index 00000000000..08c822cfdca
--- /dev/null
+++ b/xmake/modules/core/tools/zig_cc/features.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        features.lua
+--
+
+-- imports
+inherit("core.tools.gcc.features")
+
diff --git a/xmake/modules/core/tools/zig_cc/has_flags.lua b/xmake/modules/core/tools/zig_cc/has_flags.lua
new file mode 100644
index 00000000000..76744a133dd
--- /dev/null
+++ b/xmake/modules/core/tools/zig_cc/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gcc.has_flags")
+
diff --git a/xmake/modules/core/tools/zig_cxx/features.lua b/xmake/modules/core/tools/zig_cxx/features.lua
new file mode 100644
index 00000000000..08c822cfdca
--- /dev/null
+++ b/xmake/modules/core/tools/zig_cxx/features.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        features.lua
+--
+
+-- imports
+inherit("core.tools.gcc.features")
+
diff --git a/xmake/modules/core/tools/zig_cxx/has_flags.lua b/xmake/modules/core/tools/zig_cxx/has_flags.lua
new file mode 100644
index 00000000000..76744a133dd
--- /dev/null
+++ b/xmake/modules/core/tools/zig_cxx/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("core.tools.gcc.has_flags")
+
diff --git a/xmake/modules/detect/tools/armasm64_msvc/has_flags.lua b/xmake/modules/detect/tools/armasm64_msvc/has_flags.lua
deleted file mode 100644
index e05f902c8b4..00000000000
--- a/xmake/modules/detect/tools/armasm64_msvc/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.armasm_msvc.has_flags")
-
diff --git a/xmake/modules/detect/tools/cosmocxx/has_flags.lua b/xmake/modules/detect/tools/cosmocxx/has_flags.lua
deleted file mode 100644
index 3f4e9dfad07..00000000000
--- a/xmake/modules/detect/tools/cosmocxx/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.cosmocc.has_flags")
-
diff --git a/xmake/modules/detect/tools/dpcpp/features.lua b/xmake/modules/detect/tools/dpcpp/features.lua
deleted file mode 100644
index e54887f7162..00000000000
--- a/xmake/modules/detect/tools/dpcpp/features.lua
+++ /dev/null
@@ -1,22 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        features.lua
---
-
--- imports
-inherit("detect.tools.clang.features")
diff --git a/xmake/modules/detect/tools/dpcpp/has_flags.lua b/xmake/modules/detect/tools/dpcpp/has_flags.lua
deleted file mode 100644
index d8c6f279275..00000000000
--- a/xmake/modules/detect/tools/dpcpp/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.clang.has_flags")
-
diff --git a/xmake/modules/detect/tools/emxx/has_flags.lua b/xmake/modules/detect/tools/emxx/has_flags.lua
deleted file mode 100644
index 27fc6812e52..00000000000
--- a/xmake/modules/detect/tools/emxx/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.emcc.has_flags")
-
diff --git a/xmake/modules/detect/tools/gccgo/has_flags.lua b/xmake/modules/detect/tools/gccgo/has_flags.lua
deleted file mode 100644
index 6464e10b633..00000000000
--- a/xmake/modules/detect/tools/gccgo/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gcc.has_flags")
-
diff --git a/xmake/modules/detect/tools/gxx/has_flags.lua b/xmake/modules/detect/tools/gxx/has_flags.lua
deleted file mode 100644
index 6464e10b633..00000000000
--- a/xmake/modules/detect/tools/gxx/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gcc.has_flags")
-
diff --git a/xmake/modules/detect/tools/icc/has_flags.lua b/xmake/modules/detect/tools/icc/has_flags.lua
deleted file mode 100644
index 6464e10b633..00000000000
--- a/xmake/modules/detect/tools/icc/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gcc.has_flags")
-
diff --git a/xmake/modules/detect/tools/icpc/has_flags.lua b/xmake/modules/detect/tools/icpc/has_flags.lua
deleted file mode 100644
index da83182b591..00000000000
--- a/xmake/modules/detect/tools/icpc/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gxx.has_flags")
-
diff --git a/xmake/modules/detect/tools/icpx/features.lua b/xmake/modules/detect/tools/icpx/features.lua
deleted file mode 100644
index e9dc9ae44d2..00000000000
--- a/xmake/modules/detect/tools/icpx/features.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        features.lua
---
-
--- imports
-inherit("detect.tools.clang.features")
-
diff --git a/xmake/modules/detect/tools/icpx/has_flags.lua b/xmake/modules/detect/tools/icpx/has_flags.lua
deleted file mode 100644
index d8c6f279275..00000000000
--- a/xmake/modules/detect/tools/icpx/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.clang.has_flags")
-
diff --git a/xmake/modules/detect/tools/icx/features.lua b/xmake/modules/detect/tools/icx/features.lua
deleted file mode 100644
index e54887f7162..00000000000
--- a/xmake/modules/detect/tools/icx/features.lua
+++ /dev/null
@@ -1,22 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        features.lua
---
-
--- imports
-inherit("detect.tools.clang.features")
diff --git a/xmake/modules/detect/tools/icx/has_flags.lua b/xmake/modules/detect/tools/icx/has_flags.lua
deleted file mode 100644
index d8c6f279275..00000000000
--- a/xmake/modules/detect/tools/icx/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.clang.has_flags")
-
diff --git a/xmake/modules/detect/tools/ifx/has_flags.lua b/xmake/modules/detect/tools/ifx/has_flags.lua
deleted file mode 100644
index 161e337e96a..00000000000
--- a/xmake/modules/detect/tools/ifx/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.ifort.has_flags")
-
diff --git a/xmake/modules/detect/tools/ldc2/has_flags.lua b/xmake/modules/detect/tools/ldc2/has_flags.lua
deleted file mode 100644
index 107ec49b99c..00000000000
--- a/xmake/modules/detect/tools/ldc2/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.dmd.has_flags")
-
diff --git a/xmake/modules/detect/tools/nvc/has_flags.lua b/xmake/modules/detect/tools/nvc/has_flags.lua
deleted file mode 100644
index 6464e10b633..00000000000
--- a/xmake/modules/detect/tools/nvc/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gcc.has_flags")
-
diff --git a/xmake/modules/detect/tools/nvcxx/has_flags.lua b/xmake/modules/detect/tools/nvcxx/has_flags.lua
deleted file mode 100644
index 6464e10b633..00000000000
--- a/xmake/modules/detect/tools/nvcxx/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gcc.has_flags")
-
diff --git a/xmake/modules/detect/tools/nvfortran/has_flags.lua b/xmake/modules/detect/tools/nvfortran/has_flags.lua
deleted file mode 100644
index c0ee706cd6a..00000000000
--- a/xmake/modules/detect/tools/nvfortran/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gfortran.has_flags")
-
diff --git a/xmake/modules/detect/tools/swift_frontend/has_flags.lua b/xmake/modules/detect/tools/swift_frontend/has_flags.lua
deleted file mode 100644
index 4af0d592fe6..00000000000
--- a/xmake/modules/detect/tools/swift_frontend/has_flags.lua
+++ /dev/null
@@ -1,22 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.swiftc.has_flags")
diff --git a/xmake/modules/detect/tools/tcc/has_flags.lua b/xmake/modules/detect/tools/tcc/has_flags.lua
deleted file mode 100644
index 6464e10b633..00000000000
--- a/xmake/modules/detect/tools/tcc/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gcc.has_flags")
-
diff --git a/xmake/modules/detect/tools/zig_cc/features.lua b/xmake/modules/detect/tools/zig_cc/features.lua
deleted file mode 100644
index b887b9efcd1..00000000000
--- a/xmake/modules/detect/tools/zig_cc/features.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        features.lua
---
-
--- imports
-inherit("detect.tools.gcc.features")
-
diff --git a/xmake/modules/detect/tools/zig_cc/has_flags.lua b/xmake/modules/detect/tools/zig_cc/has_flags.lua
deleted file mode 100644
index 6464e10b633..00000000000
--- a/xmake/modules/detect/tools/zig_cc/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gcc.has_flags")
-
diff --git a/xmake/modules/detect/tools/zig_cxx/features.lua b/xmake/modules/detect/tools/zig_cxx/features.lua
deleted file mode 100644
index b887b9efcd1..00000000000
--- a/xmake/modules/detect/tools/zig_cxx/features.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        features.lua
---
-
--- imports
-inherit("detect.tools.gcc.features")
-
diff --git a/xmake/modules/detect/tools/zig_cxx/has_flags.lua b/xmake/modules/detect/tools/zig_cxx/has_flags.lua
deleted file mode 100644
index 6464e10b633..00000000000
--- a/xmake/modules/detect/tools/zig_cxx/has_flags.lua
+++ /dev/null
@@ -1,23 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_flags.lua
---
-
--- imports
-inherit("detect.tools.gcc.has_flags")
-
diff --git a/xmake/modules/lib/detect/features.lua b/xmake/modules/lib/detect/features.lua
index 7a00b04b45e..ac72d288da3 100644
--- a/xmake/modules/lib/detect/features.lua
+++ b/xmake/modules/lib/detect/features.lua
@@ -68,8 +68,8 @@ function main(name, opt)
         return result
     end
 
-    -- detect.tools.xxx.features(opt)?
-    local features = import("detect.tools." .. tool.name .. ".features", {try = true})
+    -- core.tools.xxx.features(opt)?
+    local features = import("core.tools." .. tool.name .. ".features", {try = true})
     if features then
         result = features(opt)
     end
diff --git a/xmake/modules/lib/detect/has_flags.lua b/xmake/modules/lib/detect/has_flags.lua
index abfae3a5754..7f915fe21b2 100644
--- a/xmake/modules/lib/detect/has_flags.lua
+++ b/xmake/modules/lib/detect/has_flags.lua
@@ -118,8 +118,8 @@ function main(name, flags, opt)
     -- start profile
     profiler.enter("has_flags", tool.name, checkflags[1])
 
-    -- detect.tools.xxx.has_flags(flags, opt)?
-    local hasflags = import("detect.tools." .. tool.name .. ".has_flags", {try = true})
+    -- core.tools.xxx.has_flags(flags, opt)?
+    local hasflags = import("core.tools." .. tool.name .. ".has_flags", {try = true})
     local errors = nil
     if hasflags then
         result, errors = hasflags(checkflags, opt)