summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-11-22 22:31:26 +0800
committerruki <[email protected]>2018-11-22 09:08:39 +0800
commitd99cdd5442a808c7346be1d2948d4184ec4573f3 (patch)
tree8d403d2e7952e187e1c819a7400eff65a1f37fee
parente940f6ee0d984a69ccc253f30a14cc0da991d05e (diff)
add nolink for require package
-rw-r--r--xmake/core/project/target.lua3
-rw-r--r--xmake/core/tool/builder.lua3
2 files changed, 6 insertions, 0 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 95d5bffd1..a24427d4b 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -542,6 +542,9 @@ function target:packages()
for _, name in ipairs(table.wrap(self:get("packages"))) do
local package = requireinfo.load(name)
if package and package:enabled() then
+ if package:extra("nolink") then
+ package:set("links", nil)
+ end
table.insert(self._PACKAGES, package)
end
end
diff --git a/xmake/core/tool/builder.lua b/xmake/core/tool/builder.lua
index 4f332b9ab..bc6d16aa4 100644
--- a/xmake/core/tool/builder.lua
+++ b/xmake/core/tool/builder.lua
@@ -122,6 +122,9 @@ function builder:_inherit_from_target(values, target, name)
for _, opt in ipairs(target:options()) do
table.join2(values, opt:get(name))
end
+ for _, opt in ipairs(target:packages()) do
+ table.join2(values, opt:get(name))
+ end
end
end