diff options
| author | ruki <[email protected]> | 2021-02-03 22:17:53 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-02-03 22:17:53 +0800 |
| commit | c01736b0d6c8677226d4a05dd6df018855514970 (patch) | |
| tree | f51726b8c87fea210e0f45be70874f6394e5d719 | |
| parent | 28684d867b6e7e9135e1bcdf105df48432951068 (diff) | |
rename toolchain:global
| -rw-r--r-- | xmake/core/tool/toolchain.lua | 4 | ||||
| -rw-r--r-- | xmake/toolchains/llvm/check.lua | 2 | ||||
| -rw-r--r-- | xmake/toolchains/msvc/check.lua | 2 | ||||
| -rw-r--r-- | xmake/toolchains/xcode/check.lua | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua index 256b9f864..31daea468 100644 --- a/xmake/core/tool/toolchain.lua +++ b/xmake/core/tool/toolchain.lua @@ -156,8 +156,8 @@ function _instance:is_standalone() return self:kind() == "standalone" or self:kind() == "cross" end --- global toolchain for whole platform -function _instance:global() +-- is global toolchain for whole platform +function _instance:is_global() return self:config("__global") end diff --git a/xmake/toolchains/llvm/check.lua b/xmake/toolchains/llvm/check.lua index f22d65f5e..44ea1ae2d 100644 --- a/xmake/toolchains/llvm/check.lua +++ b/xmake/toolchains/llvm/check.lua @@ -40,7 +40,7 @@ function _find_xcode(toolchain) -- xcode found xcode_sdkver = xcode.sdkver - if toolchain:global() then + if toolchain:is_global() then config.set("xcode", xcode.sdkdir, {force = true, readonly = true}) cprint("checking for Xcode directory ... ${color.success}%s", xcode.sdkdir) end diff --git a/xmake/toolchains/msvc/check.lua b/xmake/toolchains/msvc/check.lua index 84596634f..518be7626 100644 --- a/xmake/toolchains/msvc/check.lua +++ b/xmake/toolchains/msvc/check.lua @@ -79,7 +79,7 @@ end function _check_vstudio(toolchain) local vs = _check_vsenv(toolchain) if vs then - if toolchain:global() then + if toolchain:is_global() then config.set("vs", vs, {force = true, readonly = true}) end toolchain:config_set("vs", vs) diff --git a/xmake/toolchains/xcode/check.lua b/xmake/toolchains/xcode/check.lua index 0432f852a..6e243c00e 100644 --- a/xmake/toolchains/xcode/check.lua +++ b/xmake/toolchains/xcode/check.lua @@ -29,7 +29,7 @@ function main(toolchain) -- find xcode local xcode_sdkver = toolchain:config("xcode_sdkver") or config.get("xcode_sdkver") local xcode = find_xcode(config.get("xcode"), {force = true, verbose = true, - find_codesign = toolchain:global(), + find_codesign = toolchain:is_global(), sdkver = xcode_sdkver, plat = toolchain:plat(), arch = toolchain:arch()}) @@ -40,7 +40,7 @@ function main(toolchain) -- xcode found xcode_sdkver = xcode.sdkver - if toolchain:global() then + if toolchain:is_global() then config.set("xcode", xcode.sdkdir, {force = true, readonly = true}) config.set("xcode_mobile_provision", xcode.mobile_provision, {force = true, readonly = true}) config.set("xcode_codesign_identity", xcode.codesign_identity, {force = true, readonly = true}) |