diff options
27 files changed, 77 insertions, 75 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") diff --git a/xmake/languages/dlang/xmake.lua b/xmake/languages/dlang/xmake.lua index 6481381f0..f30706797 100644 --- a/xmake/languages/dlang/xmake.lua +++ b/xmake/languages/dlang/xmake.lua @@ -28,7 +28,7 @@ language("dlang") set_sourceflags {dc = "dcflags"} -- set target kinds - set_targetkinds {binary = "dc-ld", static = "dc-ar", shared = "dc-sh"} + set_targetkinds {binary = "dcld", static = "dcar", shared = "dcsh"} -- set target flags set_targetflags {binary = "ldflags", static = "arflags", shared = "shflags"} @@ -113,9 +113,9 @@ language("dlang") , {nil, "dc", "kv", nil, "The Dlang Compiler" } , {category = "Cross Complation Configuration/Linker Configuration" } - , {nil, "dc-ld", "kv", nil, "The Dlang Linker" } - , {nil, "dc-ar", "kv", nil, "The Dlang Static Library Archiver" } - , {nil, "dc-sh", "kv", nil, "The Dlang Shared Library Linker" } + , {nil, "dcld", "kv", nil, "The Dlang Linker" } + , {nil, "dcar", "kv", nil, "The Dlang Static Library Archiver" } + , {nil, "dcsh", "kv", nil, "The Dlang Shared Library Linker" } , {category = "Cross Complation Configuration/Builtin Flags Configuration" } , {nil, "links", "kv", nil, "The Link Libraries" } diff --git a/xmake/languages/golang/xmake.lua b/xmake/languages/golang/xmake.lua index 385e43c8b..d78d64e1d 100644 --- a/xmake/languages/golang/xmake.lua +++ b/xmake/languages/golang/xmake.lua @@ -28,7 +28,7 @@ language("golang") set_sourceflags {gc = "gcflags"} -- set target kinds - set_targetkinds {binary = "gc-ld", static = "gc-ar"} + set_targetkinds {binary = "gcld", static = "gcar"} -- set target flags set_targetflags {binary = "ldflags", static = "arflags"} @@ -109,7 +109,7 @@ language("golang") , {nil, "go", "kv", nil, "The Golang Compiler" } , {category = "Cross Complation Configuration/Linker Configuration" } - , {nil, "gc-ld", "kv", nil, "The Golang Linker" } + , {nil, "gcld", "kv", nil, "The Golang Linker" } , {nil, "go-ar", "kv", nil, "The Golang Static Library Linker" } , {category = "Cross Complation Configuration/Builtin Flags Configuration" } diff --git a/xmake/languages/rust/xmake.lua b/xmake/languages/rust/xmake.lua index 8afd1ea7a..044ed0111 100644 --- a/xmake/languages/rust/xmake.lua +++ b/xmake/languages/rust/xmake.lua @@ -28,7 +28,7 @@ language("rust") set_sourceflags {rc = "rcflags"} -- set target kinds - set_targetkinds {binary = "rc-ld", static = "rc-ar", shared = "rc-sh"} + set_targetkinds {binary = "rcld", static = "rcar", shared = "rcsh"} -- set target flags set_targetflags {binary = "ldflags", static = "arflags", shared = "shflags"} @@ -94,9 +94,9 @@ language("rust") , {nil, "rc", "kv", nil, "The Rust Compiler" } , {category = "Cross Complation Configuration/Linker Configuration" } - , {nil, "rc-ld", "kv", nil, "The Rust Linker" } - , {nil, "rc-ar", "kv", nil, "The Rust Static Library Archiver" } - , {nil, "rc-sh", "kv", nil, "The Rust Shared Library Linker" } + , {nil, "rcld", "kv", nil, "The Rust Linker" } + , {nil, "rcar", "kv", nil, "The Rust Static Library Archiver" } + , {nil, "rcsh", "kv", nil, "The Rust Shared Library Linker" } , {category = "Cross Complation Configuration/Builtin Flags Configuration" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } diff --git a/xmake/languages/swift/xmake.lua b/xmake/languages/swift/xmake.lua index a3b121a13..3ac1f0b87 100644 --- a/xmake/languages/swift/xmake.lua +++ b/xmake/languages/swift/xmake.lua @@ -28,7 +28,7 @@ language("swift") set_sourceflags {sc = "scflags"} -- set target kinds - set_targetkinds {binary = "sc-ld", static = "ar", shared = "sc-sh"} + set_targetkinds {binary = "scld", static = "ar", shared = "scsh"} -- set target flags set_targetflags {binary = "ldflags", static = "arflags", shared = "shflags"} @@ -153,8 +153,8 @@ language("swift") , { nil, "sc", "kv", nil, "The Swift Compiler" } , {category = "Cross Complation Configuration/Linker Configuration" } - , { nil, "sc-ld", "kv", nil, "The Swift Linker" } - , { nil, "sc-sh", "kv", nil, "The Swift Shared Library Linker" } + , { nil, "scld", "kv", nil, "The Swift Linker" } + , { nil, "scsh", "kv", nil, "The Swift Shared Library Linker" } , { category = "Cross Complation Configuration/Builtin Flags Configuration" } , { nil, "links", "kv", nil, "The Link Libraries" } diff --git a/xmake/modules/core/tools/dmd.lua b/xmake/modules/core/tools/dmd.lua index eaadb249c..4d74c21ae 100644 --- a/xmake/modules/core/tools/dmd.lua +++ b/xmake/modules/core/tools/dmd.lua @@ -27,10 +27,10 @@ import("core.project.project") function init(self) -- init arflags - self:set("dc-arflags", "-lib") + self:set("dcarflags", "-lib") -- init shflags - self:set("dc-shflags", "-shared", "-fPIC") + self:set("dcshflags", "-shared", "-fPIC") -- init dcflags for the kind: shared self:set("shared.dcflags", "-fPIC") diff --git a/xmake/modules/core/tools/go.lua b/xmake/modules/core/tools/go.lua index 944a14eff..80230ba4f 100644 --- a/xmake/modules/core/tools/go.lua +++ b/xmake/modules/core/tools/go.lua @@ -27,7 +27,7 @@ import("core.project.project") function init(self) -- init arflags - self:set("gc-arflags", "grc") + self:set("gcarflags", "grc") -- init the file formats self:set("formats", { static = "$(name).a" }) diff --git a/xmake/modules/core/tools/ldc2.lua b/xmake/modules/core/tools/ldc2.lua index ef4796156..9cf9fd48b 100644 --- a/xmake/modules/core/tools/ldc2.lua +++ b/xmake/modules/core/tools/ldc2.lua @@ -28,7 +28,7 @@ function init(self) _super.init(self) -- init shflags - self:set("dc-shflags", "-shared") + self:set("dcshflags", "-shared") -- init cxflags for the kind: shared self:set("shared.dcflags", "") diff --git a/xmake/modules/core/tools/rustc.lua b/xmake/modules/core/tools/rustc.lua index 227c6ad43..0ec83c803 100644 --- a/xmake/modules/core/tools/rustc.lua +++ b/xmake/modules/core/tools/rustc.lua @@ -27,13 +27,13 @@ import("core.project.project") function init(self) -- init arflags - self:set("rc-arflags", "--crate-type=lib") + self:set("rcarflags", "--crate-type=lib") -- init shflags - self:set("rc-shflags", "--crate-type=dylib") + self:set("rcshflags", "--crate-type=dylib") -- init ldflags - self:set("rc-ldflags", "--crate-type=bin") + self:set("rcldflags", "--crate-type=bin") -- init the file formats self:set("formats", { static = "lib$(name).rlib" }) 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 |