diff options
| author | Stefan Boberg <[email protected]> | 2026-03-18 14:06:42 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-03-18 14:06:42 +0100 |
| commit | 69296eaebd26cc9e6b87480f3b25a705b8c5bcb9 (patch) | |
| tree | 0641c4cb6c4c9736973fab5cbb1c55166dea7286 /src/zenserver | |
| parent | add --hub-instance-config option to set lua config path for hub instances (#854) (diff) | |
| download | zen-69296eaebd26cc9e6b87480f3b25a705b8c5bcb9.tar.xz zen-69296eaebd26cc9e6b87480f3b25a705b8c5bcb9.zip | |
workaround for change in xmake behaviour around download file naming (#858)
xmake 3.0.7 has a different naming convention than 2.9.9 leading to issues in minio on_install
also includes a fix for rpc.record test on Linux by replacing std::atomic wait/notify with condition_variable
GCC's std::atomic<int64_t>::wait/notify on Linux uses a proxy hash table
mechanism (futex only supports 32-bit words) with known issues (GCC Bug
98033, Bug 115955). Replace with std::mutex + std::condition_variable
which is well-tested and consistent with the rest of the codebase.
Diffstat (limited to 'src/zenserver')
| -rw-r--r-- | src/zenserver/xmake.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua index 7bfc3575e..aa306190f 100644 --- a/src/zenserver/xmake.lua +++ b/src/zenserver/xmake.lua @@ -19,7 +19,7 @@ target("zenserver") add_headerfiles("**.h") add_rules("utils.bin2c", {extensions = {".zip"}}) add_files("**.cpp") - add_files("$(buildir)/frontend/html.zip") + add_files(path.join(os.projectdir(), get_config("builddir") or get_config("buildir") or "build", "frontend/html.zip")) add_files("zenserver.cpp", {unity_ignored = true }) if is_plat("linux") and not (get_config("toolchain") or ""):find("clang") then |