diff options
| author | ruki <[email protected]> | 2024-02-12 11:07:54 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-12 11:07:54 +0800 |
| commit | c601bfa8240467a0a7d5ba463dd321b2be1d1bdd (patch) | |
| tree | d658ae799de766ef028329d4ef31df18f55018b2 | |
| parent | d22eb92376a02e6c4443c7c683531d969eba2d3d (diff) | |
| parent | d58663fa56c98b8ab0a08faa664439a99ea1893b (diff) | |
Merge pull request #4730 from xq114/dev
fix ar patch on macosx
| -rw-r--r-- | xmake/modules/package/tools/autoconf.lua | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index 79974822e..1de2b11a0 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -324,14 +324,17 @@ function buildenvs(package, opt) envs.CPP = _translate_windows_bin_path(envs.CPP) envs.RANLIB = _translate_windows_bin_path(envs.RANLIB) end - elseif package:is_plat("macosx") then - -- force to apply shflags on macosx https://gmplib.org/manual/Known-Build-Problems - envs.CC = envs.CC .. " -arch " .. package:arch() - elseif package:is_plat("cross") or package:has_tool("ar", "ar", "emar") then - -- only for cross-toolchain - envs.CXX = package:build_getenv("cxx") - if not envs.ARFLAGS or envs.ARFLAGS == "" then - envs.ARFLAGS = "-cr" + else + if package:is_plat("macosx") then + -- force to apply shflags on macosx https://gmplib.org/manual/Known-Build-Problems + envs.CC = envs.CC .. " -arch " .. package:arch() + end + if package:is_plat("cross") or package:has_tool("ar", "ar", "emar") then + -- only for cross-toolchain + envs.CXX = package:build_getenv("cxx") + if not envs.ARFLAGS or envs.ARFLAGS == "" then + envs.ARFLAGS = "-cr" + end end end |