diff options
| author | ruki <[email protected]> | 2026-02-11 00:51:27 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2026-02-11 00:51:27 +0800 |
| commit | 11ef7112b1b8468bfe413e161d99f56ecc8703f5 (patch) | |
| tree | 9c63a7725c96cd79f6181605b9a11926ed84da22 | |
| parent | cc60f116f272ac596b1ab1f779e02aecc719e8eb (diff) | |
improve triple
| -rw-r--r-- | xmake/modules/private/utils/toolchain.lua | 11 | ||||
| -rw-r--r-- | xmake/toolchains/xcode/load.lua | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/xmake/modules/private/utils/toolchain.lua b/xmake/modules/private/utils/toolchain.lua index b7064462c..5ce20d713 100644 --- a/xmake/modules/private/utils/toolchain.lua +++ b/xmake/modules/private/utils/toolchain.lua @@ -192,15 +192,8 @@ end function get_xcode_target_triple(toolchain) local arch = toolchain:arch() local plat = toolchain:plat() - if plat == "macosx" then - plat = "macos" - elseif plat == "iphoneos" then - plat = "ios" - elseif plat == "appletvos" then - plat = "tvos" - elseif plat == "applexros" then - plat = "xros" - end + local platmap = {macosx = "macos", iphoneos = "ios", watchos = "watchos", appletvos = "tvos", applexros = "xros"} + plat = platmap[plat] or plat local target_minver = toolchain:config("target_minver") or config.get("target_minver") local appledev = toolchain:config("appledev") or config.get("appledev") local target = format("%s-apple-%s", arch, plat) diff --git a/xmake/toolchains/xcode/load.lua b/xmake/toolchains/xcode/load.lua index 1841d8117..4dd0241db 100644 --- a/xmake/toolchains/xcode/load.lua +++ b/xmake/toolchains/xcode/load.lua @@ -21,8 +21,10 @@ import("private.utils.toolchain", {alias = "toolchain_utils"}) -- set toolset programs from xcode toolchain bindir/arch/appledev -function _set_toolset(toolchain, bindir, arch, appledev) +function _set_toolset(toolchain, appledev) + local bindir = toolchain:bindir() + local arch = toolchain:arch() local xc_clang = bindir and path.join(bindir, "clang") or "clang" local xc_clangxx = bindir and path.join(bindir, "clang++") or "clang++" local xc_ar = bindir and path.join(bindir, "ar") or "ar" @@ -119,8 +121,6 @@ end -- main entry function main(toolchain) - local bindir = toolchain:bindir() - local arch = toolchain:arch() local appledev = toolchain:config("appledev") local xcode_sysroot = toolchain:config("xcode_sysroot") if toolchain:is_plat("macosx") then @@ -128,7 +128,7 @@ function main(toolchain) end -- init toolset - _set_toolset(toolchain, bindir, arch, appledev) + _set_toolset(toolchain, appledev) -- init flags _add_common_flags(toolchain, xcode_sysroot) |