summaryrefslogtreecommitdiff
path: root/xmake/toolchains/xcode
diff options
context:
space:
mode:
authorruki <[email protected]>2020-06-04 22:34:21 +0800
committerruki <[email protected]>2020-06-04 09:26:07 +0800
commitc0ae2b21a94c639237a0cacb37577dcdde0c39d6 (patch)
tree2b87edf9e703a99f508b8358232387fdd9aa35c6 /xmake/toolchains/xcode
parent92f6908ff10f4d3ddc0c965bc9438b329782484d (diff)
rename toolsets to toolset
Diffstat (limited to 'xmake/toolchains/xcode')
-rw-r--r--xmake/toolchains/xcode/xmake.lua36
1 files changed, 18 insertions, 18 deletions
diff --git a/xmake/toolchains/xcode/xmake.lua b/xmake/toolchains/xcode/xmake.lua
index 0542dd19f..776c142af 100644
--- a/xmake/toolchains/xcode/xmake.lua
+++ b/xmake/toolchains/xcode/xmake.lua
@@ -50,29 +50,29 @@ toolchain("xcode")
raise("unknown platform for xcode!")
end
- -- set toolsets
- toolchain:set("toolsets", "cc", cross .. "clang")
- toolchain:set("toolsets", "cxx", cross .. "clang", cross .. "clang++")
- toolchain:set("toolsets", "ld", cross .. "clang++", cross .. "clang")
- toolchain:set("toolsets", "sh", cross .. "clang++", cross .. "clang")
- toolchain:set("toolsets", "ar", cross .. "ar")
- toolchain:set("toolsets", "ex", cross .. "ar")
- toolchain:set("toolsets", "strip", cross .. "strip")
- toolchain:set("toolsets", "dsymutil", cross .. "dsymutil", "dsymutil")
- toolchain:set("toolsets", "mm", cross .. "clang")
- toolchain:set("toolsets", "mxx", cross .. "clang", cross .. "clang++")
- toolchain:set("toolsets", "sc", cross .. "swiftc", "swiftc")
- toolchain:set("toolsets", "scld", cross .. "swiftc", "swiftc")
- toolchain:set("toolsets", "scsh", cross .. "swiftc", "swiftc")
+ -- set toolset
+ toolchain:set("toolset", "cc", cross .. "clang")
+ toolchain:set("toolset", "cxx", cross .. "clang", cross .. "clang++")
+ toolchain:set("toolset", "ld", cross .. "clang++", cross .. "clang")
+ toolchain:set("toolset", "sh", cross .. "clang++", cross .. "clang")
+ toolchain:set("toolset", "ar", cross .. "ar")
+ toolchain:set("toolset", "ex", cross .. "ar")
+ toolchain:set("toolset", "strip", cross .. "strip")
+ toolchain:set("toolset", "dsymutil", cross .. "dsymutil", "dsymutil")
+ toolchain:set("toolset", "mm", cross .. "clang")
+ toolchain:set("toolset", "mxx", cross .. "clang", cross .. "clang++")
+ toolchain:set("toolset", "sc", cross .. "swiftc", "swiftc")
+ toolchain:set("toolset", "scld", cross .. "swiftc", "swiftc")
+ toolchain:set("toolset", "scsh", cross .. "swiftc", "swiftc")
if arch then
- toolchain:set("toolsets", "cpp", cross .. "clang -arch " .. arch .. " -E")
+ toolchain:set("toolset", "cpp", cross .. "clang -arch " .. arch .. " -E")
end
if is_plat("macosx") then
- toolchain:set("toolsets", "as", cross .. "clang")
+ toolchain:set("toolset", "as", cross .. "clang")
elseif simulator then
- toolchain:set("toolsets", "as", cross .. "clang")
+ toolchain:set("toolset", "as", cross .. "clang")
else
- toolchain:set("toolsets", "as", path.join(os.programdir(), "scripts", "gas-preprocessor.pl " .. cross) .. "clang")
+ toolchain:set("toolset", "as", path.join(os.programdir(), "scripts", "gas-preprocessor.pl " .. cross) .. "clang")
end
-- load configurations