aboutsummaryrefslogtreecommitdiff
path: root/xmake.lua
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2022-01-13 09:24:39 +0100
committerMartin Ridgers <[email protected]>2022-01-13 09:24:39 +0100
commit80d6b98f1e9b4f3977fb79d2212bbd83ed7cf7bb (patch)
tree2531b55af40eb9bdda73b60c6148b0e4d1e1f3f9 /xmake.lua
parentMore complete toolchain and C++ library version checks (diff)
downloadzen-80d6b98f1e9b4f3977fb79d2212bbd83ed7cf7bb.tar.xz
zen-80d6b98f1e9b4f3977fb79d2212bbd83ed7cf7bb.zip
Fixed 'xmake test' using the wrong architecture value on non-Windows
Diffstat (limited to 'xmake.lua')
-rw-r--r--xmake.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/xmake.lua b/xmake.lua
index a053f0be3..616032373 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -244,8 +244,15 @@ task("test")
server = "zenserver",
integration = "zenserver-test"
}
+
+ local arch
+ if is_host("windows") then
+ arch = "x64"
+ else
+ arch = "x86_64"
+ end
- print(os.exec("xmake config -c -m debug -a x64"))
+ print(os.exec("xmake config -c -m debug -a "..arch))
print(os.exec("xmake"))
local tests = {}