rename dlang, rust, swift, go ldflags

3 files changed, 8 insertions, 6 deletions

diff --git a/xmake/core/language/language.lua b/xmake/core/language/language.lua
index cd42d8ae2..eedb2c9a2 100644
--- a/xmake/core/language/language.lua
+++ b/xmake/core/language/language.lua
@@ -646,9 +646,9 @@ end
 -- e.g.
 --
 -- {
---      binary = {"ld", "gc-ld", "dc-ld"}
--- ,    static = {"ar", "gc-ar", "dc-ar"}
--- ,    shared = {"sh", "dc-sh"}
+--      binary = {"ld", "gcld", "dcld"}
+-- ,    static = {"ar", "gcar", "dcar"}
+-- ,    shared = {"sh", "dcsh"}
 -- }
 --
 function language.targetkinds()
diff --git a/xmake/core/tool/linker.lua b/xmake/core/tool/linker.lua
index ed1f47daa..d5a410b31 100644
--- a/xmake/core/tool/linker.lua
+++ b/xmake/core/tool/linker.lua
@@ -39,7 +39,7 @@ local compiler  = require("tool/compiler")
 -- add flags from the platform 
 function linker:_add_flags_from_platform(flags, targetkind)
 
-    -- attempt to add special lanugage flags first for target kind, e.g. binary.go.gc-ldflags, static.dc-arflags
+    -- attempt to add special lanugage flags first for target kind, e.g. binary.go.gcldflags, static.dcarflags
     if targetkind then
         local toolkind = self:kind()
         local toolname = self:name()
@@ -57,7 +57,7 @@ function linker:_add_flags_from_linker(flags)
     local toolkind = self:kind()
     for _, flagkind in ipairs(self:_flagkinds()) do
 
-        -- attempt to add special lanugage flags first, e.g. gc-ldflags, dc-arflags
+        -- attempt to add special lanugage flags first, e.g. gcldflags, dcarflags
         table.join2(flags, self:get(toolkind .. 'flags') or self:get(flagkind))
     end
 end
@@ -185,7 +185,7 @@ function linker.load(targetkind, sourcekinds, target)
     local toolname = linkertool:name()
     for _, flagkind in ipairs(instance:_flagkinds()) do
 
-        -- add special lanugage flags first, e.g. go.gc-ldflags or gcc.ldflags or gc-ldflags or ldflags
+        -- add special lanugage flags first, e.g. go.gcldflags or gcc.ldflags or gcldflags or ldflags
         linkertool:add(toolkind .. 'flags', platform.get(toolname .. '.' .. toolkind .. 'flags') or platform.get(toolkind .. 'flags'))
         linkertool:add(flagkind, platform.get(toolname .. '.' .. flagkind) or platform.get(flagkind))
     end
diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua
index ef04e31bf..6cfaf5802 100644
--- a/xmake/core/tool/toolchain.lua
+++ b/xmake/core/tool/toolchain.lua
@@ -27,7 +27,9 @@ local os             = require("base/os")
 local path           = require("base/path")
 local utils          = require("base/utils")
 local table          = require("base/table")
+local global         = require("base/global")
 local interpreter    = require("base/interpreter")
+local config         = require("project/config")
 local language       = require("language/language")
 local sandbox        = require("sandbox/sandbox")