improve cache prefix

2 files changed, 6 insertions, 6 deletions

diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua
index 7b198a217..710b6ef5c 100644
--- a/xmake/modules/core/tools/gcc.lua
+++ b/xmake/modules/core/tools/gcc.lua
@@ -26,7 +26,6 @@ import("core.base.global")
 import("core.project.config")
 import("core.project.project")
 import("core.language.language")
-import("private.tools.ccache")
 import("utils.progress")
 import("private.cache.build_cache")
 import("private.service.distcc_build.client", {alias = "distcc_build_client"})
@@ -473,7 +472,7 @@ function compargv(self, sourcefile, objectfile, flags)
     if (extension:startswith(".h") or extension == ".inl") then
         return _compargv_pch(self, sourcefile, objectfile, flags)
     end
-    return ccache.cmdargv(self:program(), table.join("-c", flags, "-o", objectfile, sourcefile))
+    return self:program(), table.join("-c", flags, "-o", objectfile, sourcefile)
 end
 
 -- compile the source file
diff --git a/xmake/modules/private/action/build/object.lua b/xmake/modules/private/action/build/object.lua
index 487be763a..b8816f446 100644
--- a/xmake/modules/private/action/build/object.lua
+++ b/xmake/modules/private/action/build/object.lua
@@ -23,7 +23,7 @@ import("core.base.option")
 import("core.theme.theme")
 import("core.tool.compiler")
 import("core.project.depend")
-import("private.tools.ccache")
+import("private.cache.build_cache")
 import("private.async.runjobs")
 import("utils.progress")
 import("private.service.distcc_build.client", {alias = "distcc_build_client"})
@@ -61,11 +61,12 @@ function _do_build_file(target, sourcefile, opt)
 
     -- exists ccache or distcc?
     local prefix = ""
-    if distcc_build_client.is_distccjob() and distcc_build_client.singleton():has_freejobs() then
-        prefix = "distcc "
-    elseif ccache.exists() then
+    if build_cache.is_enabled() and build_cache.is_supported(sourcekind) then
         prefix = "ccache "
     end
+    if distcc_build_client.is_distccjob() and distcc_build_client.singleton():has_freejobs() then
+        prefix = prefix .. "distcc "
+    end
 
     -- trace progress info
     if not opt.quiet then