summaryrefslogtreecommitdiff
path: root/xmake/platforms/linux
diff options
context:
space:
mode:
authorruki <[email protected]>2020-05-16 10:59:10 +0800
committerruki <[email protected]>2020-05-16 10:59:10 +0800
commitd021df166bfd45c2d18ae6fa39cd685006491d01 (patch)
tree00ae776fe15fc6f70c30877b1b2eaeba2cd3d4f8 /xmake/platforms/linux
parent87a0828f8d20d3a1a83aed640e6e77560668e488 (diff)
rename dlang, rust, swift, go ldflags
Diffstat (limited to 'xmake/platforms/linux')
-rw-r--r--xmake/platforms/linux/config.lua6
-rw-r--r--xmake/platforms/linux/load.lua10
2 files changed, 8 insertions, 8 deletions
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