uses singleton for platform

1 files changed, 2 insertions, 8 deletions

diff --git a/xmake/platforms/linux/config.lua b/xmake/platforms/linux/config.lua
index ed6fcf543..bbcf2df21 100644
--- a/xmake/platforms/linux/config.lua
+++ b/xmake/platforms/linux/config.lua
@@ -24,6 +24,7 @@
 
 -- imports
 import("core.project.config")
+import("core.base.singleton")
 import("detect.sdks.find_cross_toolchain")
 import("private.platform.toolchain")
 import("private.platform.check_arch")
@@ -48,11 +49,6 @@ end
 -- get toolchains
 function _toolchains()
 
-    -- attempt to get it from cache first
-    if _g.TOOLCHAINS then
-        return _g.TOOLCHAINS
-    end
-
     -- find cross toolchain
     local cross = ""
     local cross_toolchain = find_cross_toolchain(config.get("sdk") or config.get("bin"), {bindir = config.get("bin"), cross = config.get("cross")})
@@ -158,8 +154,6 @@ function _toolchains()
     cu_ld:add("nvcc")
     cu_sh:add("nvcc")
 
-    -- save toolchains
-    _g.TOOLCHAINS = toolchains
     return toolchains
 end
 
@@ -168,7 +162,7 @@ function main(platform, name)
 
     -- only check the given config name?
     if name then
-        local toolchain = _toolchains()[name]
+        local toolchain = singleton.get("linux.toolchains", _toolchains)[name]
         if toolchain then
             check_toolchain(config, name, toolchain)
         end