8 files changed, 16 insertions, 1 deletions
diff --git a/tests/apis/custom_toolchain/xmake.lua b/tests/apis/custom_toolchain/xmake.lua
index 03d2b5344..b06229a33 100644
--- a/tests/apis/custom_toolchain/xmake.lua
+++ b/tests/apis/custom_toolchain/xmake.lua
@@ -1,6 +1,5 @@
 add_rules("mode.debug", "mode.release")
 
-add_moduledirs("xmake/modules")
 add_toolchaindirs("xmake/toolchains")
 
 set_toolchains("my-c6000")
diff --git a/tests/apis/custom_toolchain/xmake/modules/core/tools/ar6x.lua b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/core/tools/ar6x.lua
index 7e51734ff..7e51734ff 100644
--- a/tests/apis/custom_toolchain/xmake/modules/core/tools/ar6x.lua
+++ b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/core/tools/ar6x.lua
diff --git a/tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x.lua b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/core/tools/cl6x.lua
index 37ceec0b8..37ceec0b8 100644
--- a/tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x.lua
+++ b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/core/tools/cl6x.lua
diff --git a/tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/has_flags.lua b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/core/tools/cl6x/has_flags.lua
index 629f25c12..629f25c12 100644
--- a/tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/has_flags.lua
+++ b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/core/tools/cl6x/has_flags.lua
diff --git a/tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/parse_deps.lua b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/core/tools/cl6x/parse_deps.lua
index 301d696aa..301d696aa 100644
--- a/tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/parse_deps.lua
+++ b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/core/tools/cl6x/parse_deps.lua
diff --git a/tests/apis/custom_toolchain/xmake/modules/detect/tools/find_ar6x.lua b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/detect/tools/find_ar6x.lua
index 2ee4c4853..2ee4c4853 100644
--- a/tests/apis/custom_toolchain/xmake/modules/detect/tools/find_ar6x.lua
+++ b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/detect/tools/find_ar6x.lua
diff --git a/tests/apis/custom_toolchain/xmake/modules/detect/tools/find_cl6x.lua b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/detect/tools/find_cl6x.lua
index 1db484762..1db484762 100644
--- a/tests/apis/custom_toolchain/xmake/modules/detect/tools/find_cl6x.lua
+++ b/tests/apis/custom_toolchain/xmake/toolchains/my-c6000/modules/detect/tools/find_cl6x.lua
diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index beab21a22..2ea22e655 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -215,6 +215,22 @@ function project._api_add_toolchaindirs(interp, ...)
             dir = path.absolute(dir, scriptdir)
         end
         toolchain.add_directories(dir)
+        -- auto-register modules directories under each toolchain
+        -- e.g. toolchains/my-c6000/modules/ will be added as module search path
+        -- so that custom toolchain can bundle its tool modules together
+        local toolchain_subdirs = os.dirs(path.join(dir, "*"))
+        if toolchain_subdirs then
+            local modulesdirs = {}
+            for _, toolchain_subdir in ipairs(toolchain_subdirs) do
+                local modulesdir = path.join(toolchain_subdir, "modules")
+                if os.isdir(modulesdir) then
+                    table.insert(modulesdirs, modulesdir)
+                end
+            end
+            if #modulesdirs > 0 then
+                sandbox_module.add_directories(table.unpack(modulesdirs))
+            end
+        end
     end
 end