Fix autoconfs not handling shflags and arflags

xmake-io · Apr 23, 2024 · 4e77f66 · 4e77f66
1 parent 0219243
commit 4e77f66
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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))