summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-09-29 22:47:56 +0800
committerruki <[email protected]>2021-09-29 22:47:56 +0800
commit4b9fec3f8052c2e1096bca31908c51f409ef8dd1 (patch)
treea30a6e238d3c3048db92dac9755e9322c374866b
parent913fcb7fbe40b009eb6759dd00b37ece56ef72a8 (diff)
improve tools/meson
-rw-r--r--xmake/modules/package/tools/meson.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
index 6361f2a0e..a57497343 100644
--- a/xmake/modules/package/tools/meson.lua
+++ b/xmake/modules/package/tools/meson.lua
@@ -25,11 +25,11 @@ import("core.tool.toolchain")
import("package.tools.ninja")
-- get build directory
-function _get_buildir(opt)
+function _get_buildir(package, opt)
if opt and opt.buildir then
return opt.buildir
else
- _g.buildir = _g.buildir or ("build_" .. hash.uuid4():split('%-')[1])
+ _g.buildir = _g.buildir or package:buildir()
return _g.buildir
end
end
@@ -56,7 +56,7 @@ function _get_configs(package, configs, opt)
end
-- add build directory
- table.insert(configs, _get_buildir(opt))
+ table.insert(configs, _get_buildir(package, opt))
return configs
end
@@ -160,7 +160,7 @@ function build(package, configs, opt)
generate(package, configs, opt)
-- do build
- local buildir = _get_buildir(opt)
+ local buildir = _get_buildir(package, opt)
ninja.build(package, {}, {buildir = buildir, envs = opt.envs or buildenvs(package, opt)})
end
@@ -172,7 +172,7 @@ function install(package, configs, opt)
generate(package, configs, opt)
-- do build and install
- local buildir = _get_buildir(opt)
+ local buildir = _get_buildir(package, opt)
ninja.install(package, {}, {buildir = buildir, envs = opt.envs or buildenvs(package, opt)})
-- fix static libname on windows