diff options
| author | ruki <[email protected]> | 2020-10-09 23:00:46 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-10-09 23:00:46 +0800 |
| commit | d3bfdfc1d50ebf2ad031b7805cac7590f4bd59ef (patch) | |
| tree | 8a2e1006d58e37a1b6d68c29ccb91922c78f01ac /xmake/modules | |
| parent | 1009a225a30be32bc6db608878ff09cb2b85fcda (diff) | |
improve autotools
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/package/tools/autoconf.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/private/action/trybuild/autotools.lua | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index 37da6768b..f9c64e44b 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -153,7 +153,7 @@ function configure(package, configs, opt) end -- pass configurations - local argv = {} + local argv = {"./configure"} for name, value in pairs(_get_configs(package, configs)) do value = tostring(value):trim() if value ~= "" then @@ -166,7 +166,7 @@ function configure(package, configs, opt) end -- do configure - os.vrunv("./configure", argv, {envs = opt.envs or buildenvs(package)}) + os.vrunv("sh", argv, {envs = opt.envs or buildenvs(package)}) end -- install package diff --git a/xmake/modules/private/action/trybuild/autotools.lua b/xmake/modules/private/action/trybuild/autotools.lua index 095d41712..6c35bdbb0 100644 --- a/xmake/modules/private/action/trybuild/autotools.lua +++ b/xmake/modules/private/action/trybuild/autotools.lua @@ -204,7 +204,7 @@ function build() -- do configure local configfile = find_file("[mM]akefile", os.curdir()) if not configfile or os.mtime(config.filepath()) > os.mtime(configfile) then - os.vexecv("./configure", _get_configs(artifacts_dir), {envs = _get_buildenvs()}) + os.vexecv("sh", table.join("./configure", _get_configs(artifacts_dir)), {envs = _get_buildenvs()}) end -- do build |