From 8436c243d9515c577bd85577b08dd18965e2d631 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 21 Feb 2024 23:55:17 +0800 Subject: translate path for configure --- xmake/modules/package/tools/autoconf.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua index 1de2b11a0..7773d52de 100644 --- a/xmake/modules/package/tools/autoconf.lua +++ b/xmake/modules/package/tools/autoconf.lua @@ -315,15 +315,6 @@ function buildenvs(package, opt) envs.LD = path.join(path.directory(ld), is_host("windows") and "ld" or "i686-w64-mingw32-ld") end end - if is_host("windows") then - envs.CC = _translate_windows_bin_path(envs.CC) - envs.AS = _translate_windows_bin_path(envs.AS) - envs.AR = _translate_windows_bin_path(envs.AR) - envs.LD = _translate_windows_bin_path(envs.LD) - envs.LDSHARED = _translate_windows_bin_path(envs.LDSHARED) - envs.CPP = _translate_windows_bin_path(envs.CPP) - envs.RANLIB = _translate_windows_bin_path(envs.RANLIB) - end else if package:is_plat("macosx") then -- force to apply shflags on macosx https://gmplib.org/manual/Known-Build-Problems @@ -371,6 +362,15 @@ function buildenvs(package, opt) envs.CXX = dir and path.join(dir, name) or name end end + if is_host("windows") then + envs.CC = _translate_windows_bin_path(envs.CC) + envs.AS = _translate_windows_bin_path(envs.AS) + envs.AR = _translate_windows_bin_path(envs.AR) + envs.LD = _translate_windows_bin_path(envs.LD) + envs.LDSHARED = _translate_windows_bin_path(envs.LDSHARED) + envs.CPP = _translate_windows_bin_path(envs.CPP) + envs.RANLIB = _translate_windows_bin_path(envs.RANLIB) + end local ACLOCAL_PATH = {} local PKG_CONFIG_PATH = {} for _, dep in ipairs(package:librarydeps({private = true})) do -- cgit v1.3.1