diff options
| author | ruki <[email protected]> | 2025-12-15 13:41:50 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-12-15 13:41:50 +0800 |
| commit | fb06feeb88ecd2512a4a737d7e543b88892ad783 (patch) | |
| tree | 02dcca161c9389b28ef04d3b0af4967b4530377d /xmake/rules/utils/bin2obj | |
| parent | 777fdde191dc443aba4b987c07247446e10bb5d9 (diff) | |
| parent | 1243c8ca1a3edbbdc5d4669f6be199bd3f20e0e8 (diff) | |
Merge pull request #7125 from xmake-io/cosmocc
fix cosmocc ci
Diffstat (limited to 'xmake/rules/utils/bin2obj')
| -rw-r--r-- | xmake/rules/utils/bin2obj/utils.lua | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xmake/rules/utils/bin2obj/utils.lua b/xmake/rules/utils/bin2obj/utils.lua index 0e2bba9fd..3e8802e97 100644 --- a/xmake/rules/utils/bin2obj/utils.lua +++ b/xmake/rules/utils/bin2obj/utils.lua @@ -36,10 +36,15 @@ function generate_objectfile(target, batchcmds, binaryfile, opt) local rulename = opt.rulename or "utils.bin2obj" local progress = opt.progress + -- check for cosmocc toolchain + local is_cosmocc = target:toolchain("cosmocc") or (target:has_tool("cc", "cosmocc") and target:has_tool("ar", "cosmoar")) + -- get format (default: auto-detect from platform) local format = opt.format or target:extraconf("rules", rulename, "format") if not format then - if target:is_plat("windows", "mingw", "msys", "cygwin") then + if is_cosmocc then + format = "elf" + elseif target:is_plat("windows", "mingw", "msys", "cygwin") then format = "coff" elseif target:is_plat("macosx", "iphoneos", "watchos", "appletvos") then format = "macho" @@ -108,6 +113,9 @@ function generate_objectfile(target, batchcmds, binaryfile, opt) if zeroend then table.insert(argv, "--zeroend") end + if is_cosmocc then + table.insert(argv, "--cosmocc") + end batchcmds:vlua("cli.binutils.bin2obj", argv) return objectfile |