summaryrefslogtreecommitdiff
path: root/xmake/modules/package/tools/autoconf.lua
diff options
context:
space:
mode:
authorJérôme Leclercq <[email protected]>2024-04-23 16:14:57 +0200
committerGitHub <[email protected]>2024-04-23 16:14:57 +0200
commit4e77f66f67494f546e43afae938e38d5a10be976 (patch)
treecdefd2daccc7d65032eeb9283ff3cc4f91f03d89 /xmake/modules/package/tools/autoconf.lua
parent0219243bddc2b742178c1b8fb7a77f1a6fdbf8f0 (diff)
Fix autoconfs not handling shflags and arflags
Diffstat (limited to 'xmake/modules/package/tools/autoconf.lua')
-rw-r--r--xmake/modules/package/tools/autoconf.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
index 7ffb355e7..d187dc64b 100644
--- a/xmake/modules/package/tools/autoconf.lua
+++ b/xmake/modules/package/tools/autoconf.lua
@@ -226,6 +226,8 @@ function buildenvs(package, opt)
cxxflags = table.join(table.wrap(package:config("cxflags")), package:config("cxxflags"))
asflags = table.copy(table.wrap(package:config("asflags")))
ldflags = table.copy(table.wrap(package:config("ldflags")))
+ shflags = table.copy(table.wrap(package:config("shflags")))
+ arflags = table.copy(table.wrap(package:config("arflags")))
if package:is_plat("linux") and package:is_arch("i386") then
table.insert(cflags, "-m32")
table.insert(cxxflags, "-m32")
@@ -239,6 +241,8 @@ function buildenvs(package, opt)
table.join2(cppflags, opt.cppflags) -- @see https://github.com/xmake-io/xmake/issues/1688
table.join2(asflags, opt.asflags)
table.join2(ldflags, opt.ldflags)
+ table.join2(shflags, opt.shflags)
+ table.join2(arflags, opt.arflags)
table.join2(cflags, _get_cflags_from_packagedeps(package, opt))
table.join2(cxxflags, _get_cflags_from_packagedeps(package, opt))
table.join2(cppflags, _get_cflags_from_packagedeps(package, opt))