summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Leclercq <[email protected]>2023-10-26 12:19:50 +0200
committerGitHub <[email protected]>2023-10-26 12:19:50 +0200
commitbc5bc55e86859f07b40f154604ee1e7afe48d1a5 (patch)
treeb90eacc03f6f0d21dfd1993931a2e37f006c81e6
parent5b0dde755ac682f18a407899f16905a1aae331f9 (diff)
Update package.lua
-rw-r--r--xmake/modules/private/action/require/impl/package.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index a726e0f27..cacfded09 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -665,7 +665,13 @@ function _inherit_parent_configs(requireinfo, package, parentinfo)
requireinfo_configs.toolchains = requireinfo_configs.toolchains or parentinfo_configs.toolchains
requireinfo_configs.vs_runtime = requireinfo_configs.vs_runtime or parentinfo_configs.vs_runtime
requireinfo_configs.lto = requireinfo_configs.lto or parentinfo_configs.lto
+ if not requireinfo_configs.lto then
+ requireinfo_configs.lto = nil
+ end
requireinfo_configs.asan = requireinfo_configs.asan or parentinfo_configs.asan
+ if not requireinfo_configs.asan then
+ requireinfo_configs.asan = nil
+ end
requireinfo.configs = requireinfo_configs
end
end