diff options
| author | ruki <[email protected]> | 2021-01-12 23:03:44 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-01-12 23:03:44 +0800 |
| commit | 9eca92ce0882344be8d945847643a3a5a4f066de (patch) | |
| tree | 217e8c11c664578f1c928d500e0513570d1c877f /xmake/modules/package/tools/make.lua | |
| parent | db1c57d774b3807640b1e09414af7c6488a5fe86 (diff) | |
fix tools/make
Diffstat (limited to 'xmake/modules/package/tools/make.lua')
| -rw-r--r-- | xmake/modules/package/tools/make.lua | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/xmake/modules/package/tools/make.lua b/xmake/modules/package/tools/make.lua index 57e9b631e..b236b9da6 100644 --- a/xmake/modules/package/tools/make.lua +++ b/xmake/modules/package/tools/make.lua @@ -112,27 +112,15 @@ end -- install package function install(package, configs, opt) - -- init options + -- do build opt = opt or {} + build(package, configs, opt) - -- pass configurations - local njob = opt.jobs or option.get("jobs") or tostring(math.ceil(os.cpuinfo().ncpu * 3 / 2)) - local argv = {"install", "-j" .. njob} + -- do install + local argv = {"install"} if option.get("verbose") then table.insert(argv, "VERBOSE=1") end - for name, value in pairs(configs) do - value = tostring(value):trim() - if value ~= "" then - if type(name) == "number" then - table.insert(argv, value) - else - table.insert(argv, name .. "=" .. value) - end - end - end - - -- do install if is_host("bsd") then os.vrunv("gmake", argv, {envs = opt.envs or buildenvs(package)}) else |
