diff options
| author | ruki <[email protected]> | 2026-01-17 08:18:41 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-01-17 08:18:41 +0800 |
| commit | 8cd1e818293ab2a87b894faaaeebbfef7e029910 (patch) | |
| tree | 604a00a53088a0e4fb869916f964ba1450f6389f | |
| parent | a2ad47fdedbb14ffe722287312a6444dcc2607e3 (diff) | |
| parent | bc8a318f59462ad30cb3b6e62c79bec5b9cba48f (diff) | |
Merge pull request #7232 from xmake-io/linker
improve linker.link_scripts
| -rw-r--r-- | xmake/rules/linker/link_scripts/xmake.lua | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/xmake/rules/linker/link_scripts/xmake.lua b/xmake/rules/linker/link_scripts/xmake.lua index 72411543b..e5fa32bb6 100644 --- a/xmake/rules/linker/link_scripts/xmake.lua +++ b/xmake/rules/linker/link_scripts/xmake.lua @@ -24,28 +24,26 @@ rule("linker.link_scripts") if not target:is_binary() and not target:is_shared() then return end - local scriptfile local sourcebatch = target:sourcebatches()["linker.link_scripts"] - if sourcebatch then - for _, sourcefile in ipairs(sourcebatch.sourcefiles) do - scriptfile = sourcefile - break - end - end - if not scriptfile then + if not sourcebatch or not sourcebatch.sourcefiles or #sourcebatch.sourcefiles == 0 then return end + -- @note apple's linker does not support it if target:is_plat("macosx", "iphoneos", "watchos", "appletvos") then return end - if target:has_tool("ld", "gcc", "gxx", "clang", "clangxx") or - target:has_tool("sh", "gcc", "gxx", "clang", "clangxx") then - target:add(target:is_shared() and "shflags" or "ldflags", "-T " .. scriptfile, {force = true}) - target:data_add("linkdepfiles", scriptfile) - elseif target:has_tool("ld", "ld") or target:has_tool("sh", "ld") then - target:add(target:is_shared() and "shflags" or "ldflags", "-T " .. scriptfile, {force = true}) - target:data_add("linkdepfiles", scriptfile) + + -- Check for supported linkers (GNU and LLVM linkers support multiple -T flags) + if target:has_tool("ld", "gcc", "gxx", "clang", "clangxx", "ld") or + target:has_tool("sh", "gcc", "gxx", "clang", "clangxx", "ld") then + + -- Add all linker scripts with -T flag + -- https://github.com/xmake-io/xmake/issues/7227 + for _, sourcefile in ipairs(sourcebatch.sourcefiles) do + target:add(target:is_shared() and "shflags" or "ldflags", "-T " .. sourcefile, {force = true}) + target:data_add("linkdepfiles", sourcefile) + end end end) |