load toolchain from project

1 files changed, 14 insertions, 1 deletions

diff --git a/xmake/core/platform/platform.lua b/xmake/core/platform/platform.lua
index af6a2f0e0..eb247f7af 100644
--- a/xmake/core/platform/platform.lua
+++ b/xmake/core/platform/platform.lua
@@ -135,6 +135,10 @@ function _instance:toolchains(opt)
             local toolchain_given = config.get("toolchain")
             if toolchain_given then
                 local toolchain_inst, errors = toolchain.load(toolchain_given)
+                -- attempt to load toolchain from project
+                if not toolchain_inst and platform._project() then
+                    toolchain_inst = platform._project().toolchain(toolchain_given)
+                end
                 if not toolchain_inst then
                     os.raise(errors)
                 end
@@ -149,7 +153,11 @@ function _instance:toolchains(opt)
         end
         if names then
             for _, name in ipairs(names) do
-                local toolchain_inst, errors = toolchain.load(name, self:name())
+                local toolchain_inst, errors = toolchain.load(name)
+                -- attempt to load toolchain from project
+                if not toolchain_inst and platform._project() then
+                    toolchain_inst = platform._project().toolchain(name)
+                end
                 if not toolchain_inst then
                     os.raise(errors)
                 end
@@ -343,6 +351,11 @@ function platform._interpreter()
     return interp
 end
 
+-- get project 
+function platform._project()
+    return platform._PROJECT
+end
+
 -- get platform apis
 function platform._apis()
     return