summaryrefslogtreecommitdiff
path: root/xmake/modules/package/tools/autoconf.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2024-03-09 00:00:53 +0800
committerruki <[email protected]>2024-03-09 00:00:53 +0800
commitbafc5ec6449244f20be126beeca903c99f527f1a (patch)
tree68430cddc56f70b731926a1b9a175dad6c33bcbd /xmake/modules/package/tools/autoconf.lua
parent5c20682446eb9b990850fbc423281d394625170d (diff)
fix pkg-config-path
Diffstat (limited to 'xmake/modules/package/tools/autoconf.lua')
-rw-r--r--xmake/modules/package/tools/autoconf.lua7
1 files changed, 5 insertions, 2 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
index fdaa3f842..bd1b71bbb 100644
--- a/xmake/modules/package/tools/autoconf.lua
+++ b/xmake/modules/package/tools/autoconf.lua
@@ -404,13 +404,16 @@ function buildenvs(package, opt)
table.insert(ACLOCAL_PATH, aclocal)
end
end
+ envs.ACLOCAL_PATH = path.joinenv(ACLOCAL_PATH)
-- fix PKG_CONFIG_PATH for windows/msys2
-- @see https://github.com/xmake-io/xmake-repo/issues/3442
if is_subhost("msys", "cygwin") then
+ -- pkg-config can only support for unix path and env seperator on msys/cygwin
PKG_CONFIG_PATH = _translate_cygwin_paths(PKG_CONFIG_PATH)
+ envs.PKG_CONFIG_PATH = path.joinenv(PKG_CONFIG_PATH, ":")
+ else
+ envs.PKG_CONFIG_PATH = path.joinenv(PKG_CONFIG_PATH)
end
- envs.ACLOCAL_PATH = path.joinenv(ACLOCAL_PATH)
- envs.PKG_CONFIG_PATH = path.joinenv(PKG_CONFIG_PATH)
return envs
end