summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-05-07 00:30:18 +0800
committerruki <[email protected]>2021-05-07 00:30:18 +0800
commitf62bccb1945e89cc4f2e574b8ba29c5566ec197f (patch)
tree9b92f9a5be8904b16d0cf349c180c73d965b4cef
parent286a92d1bd1b1690538b5d5ce7a420dfc81942d6 (diff)
fix meson buildir
-rw-r--r--xmake/modules/package/tools/meson.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
index c508b2de6..4006bf7fb 100644
--- a/xmake/modules/package/tools/meson.lua
+++ b/xmake/modules/package/tools/meson.lua
@@ -34,14 +34,14 @@ function _get_buildir(opt)
end
-- get configs
-function _get_configs(package, configs)
+function _get_configs(package, configs, opt)
-- add prefix
local configs = configs or {}
table.insert(configs, "--prefix=" .. package:installdir())
-- add build directory
- table.insert(configs, _get_buildir())
+ table.insert(configs, _get_buildir(opt))
return configs
end
@@ -100,7 +100,7 @@ function generate(package, configs, opt)
-- pass configurations
local argv = {}
- for name, value in pairs(_get_configs(package, configs)) do
+ for name, value in pairs(_get_configs(package, configs, opt)) do
value = tostring(value):trim()
if value ~= "" then
if type(name) == "number" then