summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-01-25 00:10:13 +0800
committerruki <[email protected]>2025-01-25 00:10:13 +0800
commitbeff9a0f84ce1ebdd1eeb85caee55500320595a3 (patch)
tree1eeb74ffa5f86adbeb446fbef1aafcad96d2e7ce
parent8729cdf3afc01932f67ba826ceda14b0319d3f7f (diff)
fix imports
-rw-r--r--xmake/modules/core/tools/cl.lua2
-rw-r--r--xmake/modules/core/tools/cl/parse_include.lua2
-rw-r--r--xmake/modules/core/tools/ifort.lua2
-rw-r--r--xmake/modules/core/tools/link.lua2
-rw-r--r--xmake/modules/core/tools/ml.lua2
-rw-r--r--xmake/modules/core/tools/rc.lua2
6 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua
index 3b73719e7..06e6759b9 100644
--- a/xmake/modules/core/tools/cl.lua
+++ b/xmake/modules/core/tools/cl.lua
@@ -25,7 +25,7 @@ import("core.base.hashset")
import("core.project.project")
import("core.project.policy")
import("core.language.language")
-import("core.tools.vstool")
+import("private.tools.vstool")
import("core.tools.cl.parse_include")
import("private.cache.build_cache")
import("private.service.distcc_build.client", {alias = "distcc_build_client"})
diff --git a/xmake/modules/core/tools/cl/parse_include.lua b/xmake/modules/core/tools/cl/parse_include.lua
index 009d6d1f5..700f9823f 100644
--- a/xmake/modules/core/tools/cl/parse_include.lua
+++ b/xmake/modules/core/tools/cl/parse_include.lua
@@ -24,7 +24,7 @@ import("core.base.hashset")
import("core.tool.toolchain")
import("core.cache.detectcache")
import("lib.detect.find_tool")
-import("core.tools.vstool")
+import("private.tools.vstool")
-- probe include note prefix from cl
function probe_include_note_from_cl()
diff --git a/xmake/modules/core/tools/ifort.lua b/xmake/modules/core/tools/ifort.lua
index 6235c50ff..2d48f34c7 100644
--- a/xmake/modules/core/tools/ifort.lua
+++ b/xmake/modules/core/tools/ifort.lua
@@ -23,7 +23,7 @@ if is_host("windows") then
-- imports
inherit("cl")
inherit("link")
- import("core.tools.vstool")
+ import("private.tools.vstool")
-- init it
function init(self)
diff --git a/xmake/modules/core/tools/link.lua b/xmake/modules/core/tools/link.lua
index 62f794bdd..3e51ad40a 100644
--- a/xmake/modules/core/tools/link.lua
+++ b/xmake/modules/core/tools/link.lua
@@ -20,7 +20,7 @@
-- imports
import("core.project.config")
-import("core.tools.vstool")
+import("private.tools.vstool")
-- init it
function init(self)
diff --git a/xmake/modules/core/tools/ml.lua b/xmake/modules/core/tools/ml.lua
index 4af30e7e7..5bb1fb884 100644
--- a/xmake/modules/core/tools/ml.lua
+++ b/xmake/modules/core/tools/ml.lua
@@ -19,7 +19,7 @@
--
-- imports
-import("core.tools.vstool")
+import("private.tools.vstool")
import("core.base.hashset")
-- init it
diff --git a/xmake/modules/core/tools/rc.lua b/xmake/modules/core/tools/rc.lua
index 423652b49..91c1984ca 100644
--- a/xmake/modules/core/tools/rc.lua
+++ b/xmake/modules/core/tools/rc.lua
@@ -22,7 +22,7 @@
import("core.base.option")
import("core.base.hashset")
import("core.project.project")
-import("core.tools.vstool")
+import("private.tools.vstool")
-- normailize path of a dependecy
function _normailize_dep(dep, projectdir)