diff options
| author | ruki <[email protected]> | 2023-02-16 18:32:06 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-02-16 18:32:06 +0800 |
| commit | 2c7cd309e27e2b15619ee5bf1e2a4098d7c729ec (patch) | |
| tree | d5c83d843987d4bd8525ff8df0f4b4fac08f0a1d | |
| parent | 6800854f448ab11095f354c59bbdc7ab7f935c55 (diff) | |
| parent | ac3a6962228c7be4e2b5da65492298f26e8378a1 (diff) | |
Merge pull request #3375 from xq114/dev
fix meson
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index f99e20c77..218bbcec5 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -391,7 +391,7 @@ function generate(package, configs, opt) -- do configure local meson = assert(find_tool("meson"), "meson not found!") - os.vrunv(meson, argv, {envs = opt.envs or buildenvs(package, opt)}) + os.vrunv(meson.program, argv, {envs = opt.envs or buildenvs(package, opt)}) end -- build package @@ -413,7 +413,7 @@ function build(package, configs, opt) -- do build local meson = assert(find_tool("meson"), "meson not found!") - os.vrunv(meson, argv, {envs = opt.envs or buildenvs(package, opt)}) + os.vrunv(meson.program, argv, {envs = opt.envs or buildenvs(package, opt)}) end -- install package @@ -432,7 +432,7 @@ function install(package, configs, opt) -- do build and install local meson = assert(find_tool("meson"), "meson not found!") - os.vrunv(meson, {"install", "-C", buildir}, {envs = opt.envs or buildenvs(package, opt)}) + os.vrunv(meson.program, {"install", "-C", buildir}, {envs = opt.envs or buildenvs(package, opt)}) -- fix static libname on windows if package:is_plat("windows") and not package:config("shared") then |