improve linker and compiler for package

1 files changed, 4 insertions, 4 deletions

diff --git a/xmake/core/tool/compiler.lua b/xmake/core/tool/compiler.lua
index b896d04b6..0e64de8c3 100644
--- a/xmake/core/tool/compiler.lua
+++ b/xmake/core/tool/compiler.lua
@@ -46,7 +46,7 @@ function compiler:_add_flags_from_toolchains(flags, targetkind, target)
     -- add flags for platform with the given target kind, e.g. binary.gcc.cxflags or binary.cxflags
     if targetkind then
         local toolname = self:name()
-        if target and target:type() == "target" then
+        if target and target.toolconfig then
             for _, flagkind in ipairs(self:_flagkinds()) do
                 local toolflags = target:toolconfig(targetkind .. '.' .. toolname .. '.' .. flagkind)
                 table.join2(flags, toolflags or target:toolconfig(targetkind .. '.' .. flagkind))
@@ -79,7 +79,7 @@ function compiler._load_tool(sourcekind, target)
 
     -- get program from target
     local program, toolname, toolchain_info
-    if target and target:type() == "target" then
+    if target and target.tool then
         program, toolname, toolchain_info = target:tool(sourcekind)
     end
 
@@ -138,7 +138,7 @@ function compiler.load(sourcekind, target)
 
     -- add toolchains flags to the compiler tool, e.g. gcc.cxflags or cxflags
     local toolname = compiler_tool:name()
-    if target and target:type() == "target" then
+    if target and target.toolconfig then
         for _, flagkind in ipairs(instance:_flagkinds()) do
             compiler_tool:add(flagkind, target:toolconfig(toolname .. '.' .. flagkind) or target:toolconfig(flagkind))
         end
@@ -296,7 +296,7 @@ function compiler:compflags(opt)
 
     -- get target kind
     local targetkind = opt.targetkind
-    if not targetkind and target and target.targetkind then
+    if not targetkind and target and target:type() == "target" then
         targetkind = target:kind()
     end