From d58663fa56c98b8ab0a08faa664439a99ea1893b Mon Sep 17 00:00:00 2001 From: xq114 <1140735506@qq.com> Date: Mon, 12 Feb 2024 00:20:44 +0800 Subject: fix ar patch on macosx --- xmake/modules/package/tools/autoconf.lua | 19 +++++++++++-------- 1 file 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 -- cgit v1.3.1