summaryrefslogtreecommitdiff
path: root/xmake/modules/private/utils
diff options
context:
space:
mode:
authorruki <[email protected]>2025-02-26 22:59:10 +0800
committerruki <[email protected]>2025-02-26 22:59:10 +0800
commit4abb777fb6cdca3bfeebfd2ae2b2f4a2d4089dad (patch)
tree1b539f8161e193cfef8b591103ca984420f1ecdf /xmake/modules/private/utils
parent25ba77f22f2e9061135edde503e57341a6b61386 (diff)
fix concat package
Diffstat (limited to 'xmake/modules/private/utils')
-rw-r--r--xmake/modules/private/utils/package.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/xmake/modules/private/utils/package.lua b/xmake/modules/private/utils/package.lua
index 7a2ad1365..1bdef40b5 100644
--- a/xmake/modules/private/utils/package.lua
+++ b/xmake/modules/private/utils/package.lua
@@ -34,6 +34,12 @@ function _concat_packages(a, b)
-- we need to ensure link orders when removing repeat values
v = table.reverse_unique(v)
end
+ elseif k == "static" or k == "shared" then
+ v = table.unwrap(table.unique(v))
+ if type(v) == "table" then
+ -- conflict, {true, false}
+ v = true
+ end
else
v = table.unique(v)
end