summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-02-06 16:09:43 +0800
committerruki <[email protected]>2021-02-06 16:10:15 +0800
commitc4d7b7994101e9ed897a19fefc660874d9528f6c (patch)
tree63c975422fe2c90ce12c25c3648fdd2e1715e0b3
parent35506d101f6a836c6f8421544ee47121ddfb0407 (diff)
fix tools/autoconf
-rw-r--r--xmake/modules/package/tools/autoconf.lua9
1 files changed, 6 insertions, 3 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
index 19cba3365..37b05ce75 100644
--- a/xmake/modules/package/tools/autoconf.lua
+++ b/xmake/modules/package/tools/autoconf.lua
@@ -223,12 +223,15 @@ function configure(package, configs, opt)
-- init options
opt = opt or {}
+ -- get envs
+ local envs = opt.envs or buildenvs(package, opt)
+
-- generate configure file
if not os.isfile("configure") then
if os.isfile("autogen.sh") then
- os.vrunv("sh", {"./autogen.sh"})
+ os.vrunv("sh", {"./autogen.sh"}, {envs = envs})
elseif os.isfile("configure.ac") then
- os.vrun("autoreconf --install --symlink")
+ os.vrunv("autoreconf", {"--install", "--symlink"}, {envs = envs})
end
end
@@ -246,7 +249,7 @@ function configure(package, configs, opt)
end
-- do configure
- os.vrunv("sh", argv, {envs = opt.envs or buildenvs(package, opt)})
+ os.vrunv("sh", argv, {envs = envs})
end
-- install package