From 87bcb3ba85935c7a1a32d74a9ea363e2dfb4f564 Mon Sep 17 00:00:00 2001 From: Saikari Date: Thu, 26 Feb 2026 10:25:13 +0300 Subject: Try fixing issue #7354 --- xmake/modules/private/action/build/target.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xmake/modules/private/action/build/target.lua b/xmake/modules/private/action/build/target.lua index e906d4ee8..a3899b7df 100644 --- a/xmake/modules/private/action/build/target.lua +++ b/xmake/modules/private/action/build/target.lua @@ -733,10 +733,8 @@ function get_linkdepfiles(target) table.join2(extrafiles, linkdepfiles) end local objectfiles = target:objectfiles() - local depfiles = objectfiles - if #extrafiles > 0 then - depfiles = table.join(objectfiles, extrafiles) - end + local depfiles = table.join(objectfiles, extrafiles) + table.sort(depfiles) return depfiles end -- cgit v1.3.1 From 162457b698c379260f9bd5b4435b5e3ab9ce2031 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 26 Feb 2026 21:58:35 +0800 Subject: Update target.lua --- xmake/modules/private/action/build/target.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xmake/modules/private/action/build/target.lua b/xmake/modules/private/action/build/target.lua index a3899b7df..1a100f1c2 100644 --- a/xmake/modules/private/action/build/target.lua +++ b/xmake/modules/private/action/build/target.lua @@ -722,18 +722,16 @@ 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) + table.join2(depfiles, linkdepfiles) end - local objectfiles = target:objectfiles() - local depfiles = table.join(objectfiles, extrafiles) table.sort(depfiles) return depfiles end -- cgit v1.3.1