add cl6x modules

4 files changed, 1 insertions, 26 deletions

diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index 7b42d47ea..20b0a171b 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -202,17 +202,6 @@ function project._api_add_platformdirs(interp, ...)
     end
 end
 
--- add toolchain directories
-function project._api_add_toolchaindirs(interp, ...)
-    local scriptdir = project.interpreter():scriptdir()
-    for _, dir in ipairs({...}) do
-        if not path.is_absolute(dir) then
-            dir = path.absolute(dir, scriptdir)
-        end
-        toolchain.add_directories(dir)
-    end
-end
-
 -- load the project file
 function project._load(force, disable_filter)
 
@@ -669,7 +658,6 @@ function project.apis()
         ,   {"add_moduledirs",          project._api_add_moduledirs    }
         ,   {"add_plugindirs",          project._api_add_plugindirs    }
         ,   {"add_platformdirs",        project._api_add_platformdirs  }
-        ,   {"add_toolchaindirs",       project._api_add_toolchaindirs }
         }
     }
 end
diff --git a/xmake/core/sandbox/modules/import/core/tool/toolchain.lua b/xmake/core/sandbox/modules/import/core/tool/toolchain.lua
index 48867300e..46bd9fb1d 100644
--- a/xmake/core/sandbox/modules/import/core/tool/toolchain.lua
+++ b/xmake/core/sandbox/modules/import/core/tool/toolchain.lua
@@ -28,8 +28,7 @@ local project   = require("project/project")
 local raise     = require("sandbox/modules/raise")
 
 -- inherit some builtin interfaces
-sandbox_core_tool_toolchain.apis        = toolchain.apis
-sandbox_core_tool_toolchain.directories = toolchain.directories
+sandbox_core_tool_toolchain.apis = toolchain.apis
 
 -- get all toolchains list
 function sandbox_core_tool_toolchain.list()
diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua
index 1085df198..a19413d34 100644
--- a/xmake/core/tool/toolchain.lua
+++ b/xmake/core/tool/toolchain.lua
@@ -640,15 +640,6 @@ function toolchain.directories()
     return dirs
 end
 
--- add toolchain directories
-function toolchain.add_directories(...)
-    local dirs = toolchain.directories()
-    for _, dir in ipairs({...}) do
-        table.insert(dirs, 1, dir)
-    end
-    toolchain._DIRS = table.unique(dirs)
-end
-
 -- load toolchain
 function toolchain.load(name, opt)
 
diff --git a/xmake/modules/lib/detect/find_tool.lua b/xmake/modules/lib/detect/find_tool.lua
index 8b5892483..fa2b7b3bb 100644
--- a/xmake/modules/lib/detect/find_tool.lua
+++ b/xmake/modules/lib/detect/find_tool.lua
@@ -27,9 +27,6 @@ import("core.tool.toolchain")
 
 -- find tool from modules
 function _find_from_modules(name, opt)
-    -- TODO
-    print(toolchain.directories())
-
     local find_tool = import("detect.tools.find_" .. name, {try = true})
     if find_tool then
         local program, version, toolname = find_tool(opt)