From fdda430c2af3e036683be7c2c4a2fcc37e5d08b8 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Wed, 3 Feb 2021 00:48:11 +0800
Subject: improve cross-toolchain

---
 xmake/toolchains/cross/check.lua  | 2 +-
 xmake/toolchains/cross/xmake.lua  | 4 ++--
 xmake/toolchains/gnu-rm/xmake.lua | 4 ++--
 xmake/toolchains/muslcc/xmake.lua | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'xmake/toolchains')

diff --git a/xmake/toolchains/cross/check.lua b/xmake/toolchains/cross/check.lua
index c4c22bd83..6904e304d 100644
--- a/xmake/toolchains/cross/check.lua
+++ b/xmake/toolchains/cross/check.lua
@@ -29,7 +29,7 @@ function main(toolchain)
     local sdkdir = toolchain:sdkdir()
     local bindir = toolchain:bindir()
     local cross  = toolchain:cross()
-    if not sdkdir and not bindir and not cross then
+    if not sdkdir and not bindir and not cross and not toolchain:config("packages") then
         return
     end
 
diff --git a/xmake/toolchains/cross/xmake.lua b/xmake/toolchains/cross/xmake.lua
index 839c0caed..3ec12f1f4 100644
--- a/xmake/toolchains/cross/xmake.lua
+++ b/xmake/toolchains/cross/xmake.lua
@@ -24,8 +24,8 @@ toolchain("cross")
     -- set descrption
     set_description("Common cross compilation toolchain")
 
-    -- mark as standalone toolchain
-    set_kind("standalone")
+    -- mark as cross-compilation toolchain
+    set_kind("cross")
 
     -- check toolchain
     on_check("check")
diff --git a/xmake/toolchains/gnu-rm/xmake.lua b/xmake/toolchains/gnu-rm/xmake.lua
index 912cf8ff4..4a1751172 100644
--- a/xmake/toolchains/gnu-rm/xmake.lua
+++ b/xmake/toolchains/gnu-rm/xmake.lua
@@ -25,8 +25,8 @@ toolchain("gnu-rm")
     set_homepage("https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm")
     set_description("GNU Arm Embedded Toolchain")
 
-    -- mark as standalone toolchain
-    set_kind("standalone")
+    -- mark as cross-complation toolchain
+    set_kind("cross")
 
     -- on load
     on_load(function (toolchain)
diff --git a/xmake/toolchains/muslcc/xmake.lua b/xmake/toolchains/muslcc/xmake.lua
index a78139238..cec5ecbdb 100644
--- a/xmake/toolchains/muslcc/xmake.lua
+++ b/xmake/toolchains/muslcc/xmake.lua
@@ -25,8 +25,8 @@ toolchain("muslcc")
     set_homepage("https://musl.cc/")
     set_description("The musl-based cross-compilation toolchains")
 
-    -- mark as standalone toolchain
-    set_kind("standalone")
+    -- mark as cross-compilation toolchain
+    set_kind("cross")
 
     -- on load
     on_load(function (toolchain)
-- 
cgit v1.3.1