diff options
| author | ruki <[email protected]> | 2020-04-29 00:25:31 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-04-28 20:33:08 +0800 |
| commit | 557405e0ab092384ed237bd9ad0951135dd8de4a (patch) | |
| tree | a49b7c58534643de4dece526f1f1a6ae10416285 | |
| parent | df52e7f88a9a572d9bce365a654c83a859f01325 (diff) | |
fix trybuild/autotools
| -rw-r--r-- | xmake/modules/private/action/trybuild/autotools.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xmake/modules/private/action/trybuild/autotools.lua b/xmake/modules/private/action/trybuild/autotools.lua index 512ee53df..d8c7a9f89 100644 --- a/xmake/modules/private/action/trybuild/autotools.lua +++ b/xmake/modules/private/action/trybuild/autotools.lua @@ -51,11 +51,11 @@ end function _get_buildenvs() local envs = {} if is_plat(os.subhost()) then - 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 + local cflags = table.join(table.wrap(_get_buildenv("cxflags")), _get_buildenv("cflags")) + local cxxflags = table.join(table.wrap(_get_buildenv("cxflags")), _get_buildenv("cxxflags")) + local asflags = table.copy(table.wrap(_get_buildenv("asflags"))) + local ldflags = table.copy(table.wrap(_get_buildenv("ldflags"))) + if is_plat("linux") and is_arch("i386") then table.insert(cflags, "-m32") table.insert(cxxflags, "-m32") table.insert(asflags, "-m32") |