summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2026-02-26 23:44:28 +0800
committerGitHub <[email protected]>2026-02-26 23:44:28 +0800
commit07ece4e1121e1e5ed899e65302423ce4e08c6948 (patch)
tree4910fb764ed3fc044b486ad58723a2503c4b05f7
parentc6811ca904356ef5439f3e6aff3c11b48e4903d8 (diff)
parent162457b698c379260f9bd5b4435b5e3ab9ce2031 (diff)
Merge pull request #7356 from luadebug/bin
Try fixing issue #7354
-rw-r--r--xmake/modules/private/action/build/target.lua12
1 files changed, 4 insertions, 8 deletions
diff --git a/xmake/modules/private/action/build/target.lua b/xmake/modules/private/action/build/target.lua
index e906d4ee8..1a100f1c2 100644
--- a/xmake/modules/private/action/build/target.lua
+++ b/xmake/modules/private/action/build/target.lua
@@ -722,21 +722,17 @@ end
-- get link depfiles
function get_linkdepfiles(target)
- local extrafiles = {}
+ local depfiles = table.clone(target:objectfiles())
for _, dep in ipairs(target:orderdeps()) do
if dep:kind() == "static" then
- table.insert(extrafiles, dep:targetfile())
+ table.insert(depfiles, dep:targetfile())
end
end
local linkdepfiles = target:data("linkdepfiles")
if linkdepfiles then
- table.join2(extrafiles, linkdepfiles)
- end
- local objectfiles = target:objectfiles()
- local depfiles = objectfiles
- if #extrafiles > 0 then
- depfiles = table.join(objectfiles, extrafiles)
+ table.join2(depfiles, linkdepfiles)
end
+ table.sort(depfiles)
return depfiles
end