support m32 for autoconf and make

1 files changed, 17 insertions, 4 deletions

diff --git a/xmake/modules/private/action/trybuild/autotools.lua b/xmake/modules/private/action/trybuild/autotools.lua
index 379007d3c..512ee53df 100644
--- a/xmake/modules/private/action/trybuild/autotools.lua
+++ b/xmake/modules/private/action/trybuild/autotools.lua
@@ -51,11 +51,20 @@ end
 function _get_buildenvs()
     local envs = {}
     if is_plat(os.subhost()) then
-        local cflags   = table.join(table.wrap(config.get("cxflags")), config.get("cflags"))
-        local cxxflags = table.join(table.wrap(config.get("cxflags")), config.get("cxxflags"))
+        local cflags   = table.join(table.wrap(package:config("cxflags")), package:config("cflags"))
+        local cxxflags = table.join(table.wrap(package:config("cxflags")), package:config("cxxflags"))
+        local asflags  = table.copy(table.wrap(package:config("asflags")))
+        local ldflags  = table.copy(table.wrap(package:config("ldflags")))
+        if package:is_plat("linux") and package:is_arch("i386") then
+            table.insert(cflags,   "-m32")
+            table.insert(cxxflags, "-m32")
+            table.insert(asflags,  "-m32")
+            table.insert(ldflags,  "-m32")
+        end
         envs.CFLAGS    = table.concat(cflags, ' ')
         envs.CXXFLAGS  = table.concat(cxxflags, ' ')
-        envs.ASFLAGS   = table.concat(table.wrap(config.get("asflags")), ' ')
+        envs.ASFLAGS   = table.concat(asflags, ' ')
+        envs.LDFLAGS   = table.concat(ldflags, ' ')
     else
         local cflags   = table.join(table.wrap(_get_buildenv("cxflags")), _get_buildenv("cflags"))
         local cxxflags = table.join(table.wrap(_get_buildenv("cxflags")), _get_buildenv("cxxflags"))
@@ -199,7 +208,11 @@ function build()
     end
 
     -- do build
-    os.vexec("make -j" .. option.get("jobs"))
+    local argv = {"-j" .. option.get("jobs")}
+    if option.get("verbose") then
+        table.insert(argv, "V=1")
+    end
+    os.vexecv("make", argv)
     os.vexec("make install")
     cprint("output to ${bright}%s", artifacts_dir)
     cprint("${color.success}build ok!")