improve armcc and armclang toolchain

xmake-io · Oct 26, 2021 · 63c4692 · 63c4692
1 parent ab85e9e
commit 63c4692
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua
@@ -210,7 +210,7 @@ end
 -- get the bin directory
 function _instance:bindir()
     local bindir = self:config("bindir") or config.get("bin") or self:info():get("bindir")
-    if not bindir and self:cross() and self:sdkdir() and os.isdir(path.join(self:sdkdir(), "bin")) then
+    if not bindir and self:is_cross() and self:sdkdir() and os.isdir(path.join(self:sdkdir(), "bin")) then
         bindir = path.join(self:sdkdir(), "bin")
     end
     return bindir

diff --git a/xmake/toolchains/armcc/xmake.lua b/xmake/toolchains/armcc/xmake.lua
@@ -23,7 +23,7 @@ toolchain("armcc")
     set_homepage("https://www2.keil.com/mdk5/compiler/5")
     set_description("ARM Compiler Version 5 of Keil MDK")
 
-    set_kind("standalone")
+    set_kind("cross")
 
     set_toolset("cc", "armcc")
     set_toolset("cxx", "armcc")
@@ -33,9 +33,17 @@ toolchain("armcc")
     set_toolset("as", "armasm")
 
     on_check(function (toolchain)
-        return import("lib.detect.find_tool")("armcc")
+        import("lib.detect.find_tool")
+        import("detect.sdks.find_mdk")
+        local mdk = find_mdk()
+        if mdk and mdk.sdkdir_armcc and find_tool("armcc") then
+            toolchain:config_set("sdkdir", mdk.sdkdir_armcc)
+            toolchain:configs_save()
+            return true
+        end
     end)
 
+
     on_load(function (toolchain)
         local arch = toolchain:arch()
         if arch then

diff --git a/xmake/toolchains/armclang/xmake.lua b/xmake/toolchains/armclang/xmake.lua
@@ -23,7 +23,7 @@ toolchain("armclang")
     set_homepage("https://www2.keil.com/mdk5/compiler/6")
     set_description("ARM Compiler Version 6 of Keil MDK")
 
-    set_kind("standalone")
+    set_kind("cross")
 
     set_toolset("cc", "armclang")
     set_toolset("cxx", "armclang")
@@ -33,7 +33,14 @@ toolchain("armclang")
     set_toolset("as", "armasm")
 
     on_check(function (toolchain)
-        return import("lib.detect.find_tool")("armclang")
+        import("lib.detect.find_tool")
+        import("detect.sdks.find_mdk")
+        local mdk = find_mdk()
+        if mdk and mdk.sdkdir_armclang and find_tool("armclang") then
+            toolchain:config_set("sdkdir", mdk.sdkdir_armclang)
+            toolchain:configs_save()
+            return true
+        end
     end)
 
     on_load(function (toolchain)