From f07072ae14dc0f4a0b6500b80d391fee86349420 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 5 Feb 2024 10:44:18 +0800 Subject: Update builder.lua --- xmake/core/tool/builder.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmake/core/tool/builder.lua b/xmake/core/tool/builder.lua index 255b69ca1..89014759e 100644 --- a/xmake/core/tool/builder.lua +++ b/xmake/core/tool/builder.lua @@ -222,9 +222,12 @@ end -- add flags from the target packages function builder:_add_flags_from_targetpkgs(flags, target) - for _, pkg in ipairs(target:orderpkgs()) do - for _, flagkind in ipairs(self:_flagkinds()) do - table.join2(flags, self:_mapflags(pkg:get(flagkind), flagkind, target)) + for _, flagkind in ipairs(self:_flagkinds()) do + local result = target:get_from(flagkind, "package::*") + if result then + for _, values in ipairs(result) do + table.join2(flags, self:_mapflags(values, flagkind, target)) + end end end end -- cgit v1.3.1