rename dlang, rust, swift, go ldflags

16 files changed, 49 insertions, 49 deletions

diff --git a/xmake/platforms/android/config.lua b/xmake/platforms/android/config.lua
index f199d08ba..e99a4d14a 100644
--- a/xmake/platforms/android/config.lua
+++ b/xmake/platforms/android/config.lua
@@ -81,7 +81,7 @@ function _toolchains()
     local rc_sh      = toolchain("the rust shared library linker")
     local rc_ar      = toolchain("the rust static library archiver")
     local toolchains = {cc = cc, cxx = cxx, cpp = cpp, as = as, ld = ld, sh = sh, ar = ar, ex = ex, ranlib = ranlib, strip = strip, 
-                        rc = rc, ["rc-ld"] = rc_ld, ["rc-sh"] = rc_sh, ["rc-ar"] = rc_ar}
+                        rc = rc, ["rcld"] = rc_ld, ["rcsh"] = rc_sh, ["rcar"] = rc_ar}
 
     -- init the c compiler
     cc:add({name = "gcc", cross = cross}, "clang")
diff --git a/xmake/platforms/android/load.lua b/xmake/platforms/android/load.lua
index b0ed21ba3..773d69fcc 100644
--- a/xmake/platforms/android/load.lua
+++ b/xmake/platforms/android/load.lua
@@ -305,15 +305,15 @@ function main(platform)
     if targets_rust[arch] then
         platform:add("rcflags", "--target=" .. targets_rust[arch])
     end
-    platform:add("rc-shflags", "-C link-args=\"" .. (table.concat(platform:get("shflags"), " "):gsub("%-march=.-%s", "") .. "\""))
-    platform:add("rc-ldflags", "-C link-args=\"" .. (table.concat(platform:get("ldflags"), " "):gsub("%-march=.-%s", "") .. "\""))
+    platform:add("rcshflags", "-C link-args=\"" .. (table.concat(platform:get("shflags"), " "):gsub("%-march=.-%s", "") .. "\""))
+    platform:add("rcldflags", "-C link-args=\"" .. (table.concat(platform:get("ldflags"), " "):gsub("%-march=.-%s", "") .. "\""))
     local sh = config.get("sh")
     if sh then
-        platform:add("rc-shflags", "-C linker=" .. sh)
+        platform:add("rcshflags", "-C linker=" .. sh)
     end
     local ld = config.get("ld")
     if ld then
-        platform:add("rc-ldflags", "-C linker=" .. ld)
+        platform:add("rcldflags", "-C linker=" .. ld)
     end
 end
 
diff --git a/xmake/platforms/bsd/config.lua b/xmake/platforms/bsd/config.lua
index 3a4912f78..69164b8b4 100644
--- a/xmake/platforms/bsd/config.lua
+++ b/xmake/platforms/bsd/config.lua
@@ -80,9 +80,9 @@ function _toolchains()
     local cu_ccbin   = toolchain("the cuda host c++ compiler")
     local toolchains = {cc = cc, cxx = cxx, as = as, ld = ld, sh = sh, ar = ar, ex = ex, strip = strip,
                         mm = mm, mxx = mxx,
-                        gc = gc, ["gc-ld"] = gc_ld, ["gc-ar"] = gc_ar,
-                        dc = dc, ["dc-ld"] = dc_ld, ["dc-sh"] = dc_sh, ["dc-ar"] = dc_ar,
-                        rc = rc, ["rc-ld"] = rc_ld, ["rc-sh"] = rc_sh, ["rc-ar"] = rc_ar,
+                        gc = gc, ["gcld"] = gc_ld, ["gcar"] = gc_ar,
+                        dc = dc, ["dcld"] = dc_ld, ["dcsh"] = dc_sh, ["dcar"] = dc_ar,
+                        rc = rc, ["rcld"] = rc_ld, ["rcsh"] = rc_sh, ["rcar"] = rc_ar,
                         cu = cu, ["cu-ld"] = cu_ld, ["cu-ccbin"] = cu_ccbin}
 
     -- init the c compiler
diff --git a/xmake/platforms/bsd/load.lua b/xmake/platforms/bsd/load.lua
index e1357e717..fcbbc61ff 100644
--- a/xmake/platforms/bsd/load.lua
+++ b/xmake/platforms/bsd/load.lua
@@ -66,16 +66,16 @@ function main(platform)
     platform:add("asflags", archflags)
 
     -- init flags for golang
-    platform:set("gc-ldflags", "")
+    platform:set("gcldflags", "")
 
     -- init flags for dlang
     local dc_archs = { i386 = "-m32", x86_64 = "-m64" }
     platform:add("dcflags", dc_archs[arch] or "")
-    platform:add("dc-shflags", dc_archs[arch] or "")
-    platform:add("dc-ldflags", dc_archs[arch] or "")
+    platform:add("dcshflags", dc_archs[arch] or "")
+    platform:add("dcldflags", dc_archs[arch] or "")
 
     -- init flags for rust
-    platform:set("rc-shflags", "")
-    platform:set("rc-ldflags", "")
+    platform:set("rcshflags", "")
+    platform:set("rcldflags", "")
 end
 
diff --git a/xmake/platforms/cygwin/config.lua b/xmake/platforms/cygwin/config.lua
index 6c963188d..26f008970 100644
--- a/xmake/platforms/cygwin/config.lua
+++ b/xmake/platforms/cygwin/config.lua
@@ -79,9 +79,9 @@ function _toolchains()
     local cu_ccbin   = toolchain("the cuda host c++ compiler")
     local toolchains = {cc = cc, cxx = cxx, as = as, ld = ld, sh = sh, ar = ar, ex = ex, 
                         mm = mm, mxx = mxx,
-                        gc = gc, ["gc-ld"] = gc_ld, ["gc-ar"] = gc_ar,
-                        dc = dc, ["dc-ld"] = dc_ld, ["dc-sh"] = dc_sh, ["dc-ar"] = dc_ar,
-                        rc = rc, ["rc-ld"] = rc_ld, ["rc-sh"] = rc_sh, ["rc-ar"] = rc_ar,
+                        gc = gc, ["gcld"] = gc_ld, ["gcar"] = gc_ar,
+                        dc = dc, ["dcld"] = dc_ld, ["dcsh"] = dc_sh, ["dcar"] = dc_ar,
+                        rc = rc, ["rcld"] = rc_ld, ["rcsh"] = rc_sh, ["rcar"] = rc_ar,
                         cu = cu, ["cu-ld"] = cu_ld, ["cu-ccbin"] = cu_ccbin}
 
     -- init the c compiler
diff --git a/xmake/platforms/iphoneos/config.lua b/xmake/platforms/iphoneos/config.lua
index 2a7f52aa1..1e3592f45 100644
--- a/xmake/platforms/iphoneos/config.lua
+++ b/xmake/platforms/iphoneos/config.lua
@@ -53,7 +53,7 @@ function _toolchains()
     local sc_ld      = toolchain("the swift linker")
     local sc_sh      = toolchain("the swift shared library linker")
     local toolchains = {cc = cc, cpp = cpp, cxx = cxx, as = as, ld = ld, sh = sh, ar = ar, ex = ex, strip = strip, dsymutil = dsymutil,
-                        mm = mm, mxx = mxx, sc = sc, ["sc-ld"] = sc_ld, ["sc-sh"] = sc_sh}
+                        mm = mm, mxx = mxx, sc = sc, ["scld"] = sc_ld, ["scsh"] = sc_sh}
 
     -- init the c compiler
     cc:add({name = "clang", cross = cross})
diff --git a/xmake/platforms/iphoneos/load.lua b/xmake/platforms/iphoneos/load.lua
index c41dc19d6..7d54e24be 100644
--- a/xmake/platforms/iphoneos/load.lua
+++ b/xmake/platforms/iphoneos/load.lua
@@ -56,7 +56,7 @@ function main(platform)
 
     -- init flags for swift (with platform:add("ldflags and platform:add("shflags)
     platform:add("scflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
-    platform:add("sc-shflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
-    platform:add("sc-ldflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
+    platform:add("scshflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
+    platform:add("scldflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
 end
 
diff --git a/xmake/platforms/linux/config.lua b/xmake/platforms/linux/config.lua
index 489c8d15e..ac9b42931 100644
--- a/xmake/platforms/linux/config.lua
+++ b/xmake/platforms/linux/config.lua
@@ -80,9 +80,9 @@ function _toolchains()
     local cu_ccbin   = toolchain("the cuda host c++ compiler")
     local toolchains = {cc = cc, cxx = cxx, as = as, ld = ld, sh = sh, ar = ar, ex = ex, strip = strip,
                         mm = mm, mxx = mxx,
-                        gc = gc, ["gc-ld"] = gc_ld, ["gc-ar"] = gc_ar,
-                        dc = dc, ["dc-ld"] = dc_ld, ["dc-sh"] = dc_sh, ["dc-ar"] = dc_ar,
-                        rc = rc, ["rc-ld"] = rc_ld, ["rc-sh"] = rc_sh, ["rc-ar"] = rc_ar,
+                        gc = gc, ["gcld"] = gc_ld, ["gcar"] = gc_ar,
+                        dc = dc, ["dcld"] = dc_ld, ["dcsh"] = dc_sh, ["dcar"] = dc_ar,
+                        rc = rc, ["rcld"] = rc_ld, ["rcsh"] = rc_sh, ["rcar"] = rc_ar,
                         cu = cu, ["cu-ld"] = cu_ld, ["cu-ccbin"] = cu_ccbin}
 
     -- init the c compiler
diff --git a/xmake/platforms/linux/load.lua b/xmake/platforms/linux/load.lua
index e1357e717..fcbbc61ff 100644
--- a/xmake/platforms/linux/load.lua
+++ b/xmake/platforms/linux/load.lua
@@ -66,16 +66,16 @@ function main(platform)
     platform:add("asflags", archflags)
 
     -- init flags for golang
-    platform:set("gc-ldflags", "")
+    platform:set("gcldflags", "")
 
     -- init flags for dlang
     local dc_archs = { i386 = "-m32", x86_64 = "-m64" }
     platform:add("dcflags", dc_archs[arch] or "")
-    platform:add("dc-shflags", dc_archs[arch] or "")
-    platform:add("dc-ldflags", dc_archs[arch] or "")
+    platform:add("dcshflags", dc_archs[arch] or "")
+    platform:add("dcldflags", dc_archs[arch] or "")
 
     -- init flags for rust
-    platform:set("rc-shflags", "")
-    platform:set("rc-ldflags", "")
+    platform:set("rcshflags", "")
+    platform:set("rcldflags", "")
 end
 
diff --git a/xmake/platforms/macosx/config.lua b/xmake/platforms/macosx/config.lua
index b440146cc..a5c0893fc 100644
--- a/xmake/platforms/macosx/config.lua
+++ b/xmake/platforms/macosx/config.lua
@@ -62,10 +62,10 @@ function _toolchains()
     local cu_ld      = toolchain("the cuda linker")
     local cu_ccbin   = toolchain("the cuda host c++ compiler")
     local toolchains = {cc = cc, cxx = cxx, as = as, ld = ld, sh = sh, ar = ar, ex = ex, strip = strip, dsymutil = dsymutil,
-                        mm = mm, mxx = mxx, sc = sc, ["sc-ld"] = sc_ld, ["sc-sh"] = sc_sh,
-                        gc = gc, ["gc-ld"] = gc_ld, ["gc-ar"] = gc_ar,
-                        dc = dc, ["dc-ld"] = dc_ld, ["dc-sh"] = dc_sh, ["dc-ar"] = dc_ar,
-                        rc = rc, ["rc-ld"] = rc_ld, ["rc-sh"] = rc_sh, ["rc-ar"] = rc_ar,
+                        mm = mm, mxx = mxx, sc = sc, ["scld"] = sc_ld, ["scsh"] = sc_sh,
+                        gc = gc, ["gcld"] = gc_ld, ["gcar"] = gc_ar,
+                        dc = dc, ["dcld"] = dc_ld, ["dcsh"] = dc_sh, ["dcar"] = dc_ar,
+                        rc = rc, ["rcld"] = rc_ld, ["rcsh"] = rc_sh, ["rcar"] = rc_ar,
                         cu = cu, ["cu-ld"] = cu_ld, ["cu-ccbin"] = cu_ccbin}
 
     -- init the c compiler
diff --git a/xmake/platforms/macosx/load.lua b/xmake/platforms/macosx/load.lua
index a9a7ff1cd..6d2547a75 100644
--- a/xmake/platforms/macosx/load.lua
+++ b/xmake/platforms/macosx/load.lua
@@ -74,21 +74,21 @@ function main(platform)
     -- init flags for swift
     if target_minver and xcode_sdkdir then
         platform:add("scflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
-        platform:add("sc-shflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
-        platform:add("sc-ldflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
+        platform:add("scshflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
+        platform:add("scldflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
     end
 
     -- init flags for golang
-    platform:set("gc-ldflags", "")
+    platform:set("gcldflags", "")
 
     -- init flags for dlang
     local dc_archs = { i386 = "-m32", x86_64 = "-m64" }
     platform:add("dcflags", dc_archs[arch] or "")
-    platform:add("dc-shflags", dc_archs[arch] or "")
-    platform:add("dc-ldflags", dc_archs[arch] or "" )
+    platform:add("dcshflags", dc_archs[arch] or "")
+    platform:add("dcldflags", dc_archs[arch] or "" )
 
     -- init flags for rust
-    platform:set("rc-shflags", "")
-    platform:set("rc-ldflags", "")
+    platform:set("rcshflags", "")
+    platform:set("rcldflags", "")
 end
 
diff --git a/xmake/platforms/msys/config.lua b/xmake/platforms/msys/config.lua
index f5fd3c0a4..dbb1be255 100644
--- a/xmake/platforms/msys/config.lua
+++ b/xmake/platforms/msys/config.lua
@@ -79,9 +79,9 @@ function _toolchains()
     local cu_ccbin   = toolchain("the cuda host c++ compiler")
     local toolchains = {cc = cc, cxx = cxx, as = as, ld = ld, sh = sh, ar = ar, ex = ex, 
                         mm = mm, mxx = mxx,
-                        gc = gc, ["gc-ld"] = gc_ld, ["gc-ar"] = gc_ar,
-                        dc = dc, ["dc-ld"] = dc_ld, ["dc-sh"] = dc_sh, ["dc-ar"] = dc_ar,
-                        rc = rc, ["rc-ld"] = rc_ld, ["rc-sh"] = rc_sh, ["rc-ar"] = rc_ar,
+                        gc = gc, ["gcld"] = gc_ld, ["gcar"] = gc_ar,
+                        dc = dc, ["dcld"] = dc_ld, ["dcsh"] = dc_sh, ["dcar"] = dc_ar,
+                        rc = rc, ["rcld"] = rc_ld, ["rcsh"] = rc_sh, ["rcar"] = rc_ar,
                         cu = cu, ["cu-ld"] = cu_ld, ["cu-ccbin"] = cu_ccbin}
 
     -- init the c compiler
diff --git a/xmake/platforms/watchos/config.lua b/xmake/platforms/watchos/config.lua
index 57504cb60..f16878b2e 100644
--- a/xmake/platforms/watchos/config.lua
+++ b/xmake/platforms/watchos/config.lua
@@ -52,7 +52,7 @@ function _toolchains()
     local sc_ld      = toolchain("the swift linker")
     local sc_sh      = toolchain("the swift shared library linker")
     local toolchains = {cc = cc, cxx = cxx, as = as, ld = ld, sh = sh, ar = ar, ex = ex, strip = strip, dsymutil = dsymutil,
-                        mm = mm, mxx = mxx, sc = sc, ["sc-ld"] = sc_ld, ["sc-sh"] = sc_sh}
+                        mm = mm, mxx = mxx, sc = sc, ["scld"] = sc_ld, ["scsh"] = sc_sh}
 
     -- init the c compiler
     cc:add({name = "clang", cross = cross})
diff --git a/xmake/platforms/watchos/load.lua b/xmake/platforms/watchos/load.lua
index 78e251728..2e0204358 100644
--- a/xmake/platforms/watchos/load.lua
+++ b/xmake/platforms/watchos/load.lua
@@ -53,7 +53,7 @@ function main(platform)
 
     -- init flags for swift (with platform:add("ldflags and platform:add("shflags)
     platform:add("scflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
-    platform:add("sc-shflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir) 
-    platform:add("sc-ldflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
+    platform:add("scshflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir) 
+    platform:add("scldflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
 end
 
diff --git a/xmake/platforms/windows/config.lua b/xmake/platforms/windows/config.lua
index 04b92ce65..c74205efe 100644
--- a/xmake/platforms/windows/config.lua
+++ b/xmake/platforms/windows/config.lua
@@ -53,9 +53,9 @@ function _toolchains()
     local cu         = toolchain("the cuda compiler")
     local cu_ld      = toolchain("the cuda linker")
     local toolchains = {cc = cc, cxx = cxx, mrc = mrc, as = as, ld = ld, sh = sh, ar = ar, ex = ex, 
-                        gc = gc, ["gc-ld"] = gc_ld, ["gc-ar"] = gc_ar,
-                        dc = dc, ["dc-ld"] = dc_ld, ["dc-sh"] = dc_sh, ["dc-ar"] = dc_ar,
-                        rc = rc, ["rc-ld"] = rc_ld, ["rc-sh"] = rc_sh, ["rc-ar"] = rc_ar,
+                        gc = gc, ["gcld"] = gc_ld, ["gcar"] = gc_ar,
+                        dc = dc, ["dcld"] = dc_ld, ["dcsh"] = dc_sh, ["dcar"] = dc_ar,
+                        rc = rc, ["rcld"] = rc_ld, ["rcsh"] = rc_sh, ["rcar"] = rc_ar,
                         cu = cu, ["cu-ld"] = cu_ld}
 
     -- init the c compiler
diff --git a/xmake/platforms/windows/load.lua b/xmake/platforms/windows/load.lua
index 78217e5f1..710cb8723 100644
--- a/xmake/platforms/windows/load.lua
+++ b/xmake/platforms/windows/load.lua
@@ -33,6 +33,6 @@ function main(platform)
     -- init flags for dlang
     local dc_archs = { x86 = "-m32", x64 = "-m64" }
     platform:add("dcflags", dc_archs[arch])
-    platform:add("dc-shflags", dc_archs[arch])
-    platform:add("dc-ldflags", dc_archs[arch])
+    platform:add("dcshflags", dc_archs[arch])
+    platform:add("dcldflags", dc_archs[arch])
 end