Merge branch 'main' into zs/long-filename-improvement

1 files changed, 13 insertions, 5 deletions

diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua
index 6b29dadfb..fe279ebb2 100644
--- a/src/zenserver/xmake.lua
+++ b/src/zenserver/xmake.lua
@@ -39,11 +39,11 @@ target("zenserver")
     add_packages("oidctoken")
     add_packages("nomad")
 
-    if has_config("zenmimalloc") then
+    if has_config("zenmimalloc") and not use_asan then
         add_packages("mimalloc")
     end
 
-    if has_config("zensentry") then
+    if has_config("zensentry") and not use_asan then
         add_packages("sentry-native")
     end
 
@@ -140,11 +140,19 @@ target("zenserver")
 
         table.insert(args, "--detach=false")
 
+        -- On Windows the ASAN runtime is a DLL whose directory must be on PATH;
+        -- runenvs.make collects that (and any other Windows package run envs).
+        local addenvs, setenvs
+        if is_host("windows") then
+            import("private.action.run.runenvs")
+            addenvs, setenvs = runenvs.make(target)
+        end
+
         -- debugging?
         if option.get("debug") then
-            debugger.run(targetfile, args, {curdir = rundir})
+            debugger.run(targetfile, args, {curdir = rundir, addenvs = addenvs, setenvs = setenvs})
         else
-            os.execv(targetfile, args, {curdir = rundir, detach = option.get("detach")})
+            os.execv(targetfile, args, {curdir = rundir, detach = option.get("detach"), addenvs = addenvs, setenvs = setenvs})
         end
     end)
 
@@ -175,7 +183,7 @@ target("zenserver")
             end
         end
 
-        if has_config("zensentry") then
+        if has_config("zensentry") and not target:policy("build.sanitizer.address") then
             local pkg = target:pkg("sentry-native")
             if pkg then
                 local installdir = pkg:installdir()