From 4e77f66f67494f546e43afae938e38d5a10be976 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Tue, 23 Apr 2024 16:14:57 +0200 Subject: Fix autoconfs not handling shflags and arflags --- xmake/modules/package/tools/autoconf.lua | 4 ++++ 1 file changed, 4 insertions(+) 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)) -- cgit v1.3.1