aboutsummaryrefslogtreecommitdiff
path: root/src/zencore/xmake.lua
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2026-03-18 09:16:42 +0100
committerGitHub Enterprise <[email protected]>2026-03-18 09:16:42 +0100
commit973fad4e4bdb03a852d40360b0a5590a370deb16 (patch)
tree530eee006d3e6c77043968719e9243ef4717e8da /src/zencore/xmake.lua
parentChangelog (diff)
parentfix for GHES failing on upload-artifacts@v3 (#856) (diff)
downloadzen-973fad4e4bdb03a852d40360b0a5590a370deb16.tar.xz
zen-973fad4e4bdb03a852d40360b0a5590a370deb16.zip
Merge branch 'main' into zs/long-filename-improvement
Diffstat (limited to 'src/zencore/xmake.lua')
-rw-r--r--src/zencore/xmake.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua
index 171f4c533..b08975df1 100644
--- a/src/zencore/xmake.lua
+++ b/src/zencore/xmake.lua
@@ -21,7 +21,7 @@ target('zencore')
add_deps("rpmalloc")
end
- if has_config("zenmimalloc") then
+ if has_config("zenmimalloc") and not use_asan then
add_packages("mimalloc")
end
@@ -47,7 +47,7 @@ target('zencore')
{public=true}
)
- if has_config("zensentry") then
+ if has_config("zensentry") and not use_asan then
add_packages("sentry-native")
if is_os("windows") then