add path.splitenv

4 files changed, 9 insertions, 9 deletions

diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
index 7705c3bca..349b2c5b5 100644
--- a/xmake/modules/package/tools/autoconf.lua
+++ b/xmake/modules/package/tools/autoconf.lua
@@ -106,8 +106,8 @@ function buildenvs(package)
             table.insert(ACLOCAL_PATH, aclocal)
         end
     end
-    envs.ACLOCAL_PATH    = table.concat(ACLOCAL_PATH, path.envsep())
-    envs.PKG_CONFIG_PATH = table.concat(PKG_CONFIG_PATH, path.envsep())
+    envs.ACLOCAL_PATH    = path.joinenv(ACLOCAL_PATH)
+    envs.PKG_CONFIG_PATH = path.joinenv(PKG_CONFIG_PATH)
     return envs
 end
 
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 7c21947d1..75b38eaf1 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -71,9 +71,9 @@ function buildenvs(package)
             table.join2(CMAKE_PREFIX_PATH, dep:installdir())
         end
     end
-    envs.CMAKE_LIBRARY_PATH = table.concat(CMAKE_LIBRARY_PATH, path.envsep())
-    envs.CMAKE_INCLUDE_PATH = table.concat(CMAKE_INCLUDE_PATH, path.envsep())
-    envs.CMAKE_PREFIX_PATH  = table.concat(CMAKE_PREFIX_PATH, path.envsep())
+    envs.CMAKE_LIBRARY_PATH = path.joinenv(CMAKE_LIBRARY_PATH)
+    envs.CMAKE_INCLUDE_PATH = path.joinenv(CMAKE_INCLUDE_PATH)
+    envs.CMAKE_PREFIX_PATH  = path.joinenv(CMAKE_PREFIX_PATH)
     return envs
 end
 
diff --git a/xmake/modules/package/tools/make.lua b/xmake/modules/package/tools/make.lua
index 13e72b310..4a7850185 100644
--- a/xmake/modules/package/tools/make.lua
+++ b/xmake/modules/package/tools/make.lua
@@ -59,8 +59,8 @@ function buildenvs(package)
             table.insert(ACLOCAL_PATH, aclocal)
         end
     end
-    envs.ACLOCAL_PATH    = table.concat(ACLOCAL_PATH, path.envsep())
-    envs.PKG_CONFIG_PATH = table.concat(PKG_CONFIG_PATH, path.envsep())
+    envs.ACLOCAL_PATH    = path.joinenv(ACLOCAL_PATH)
+    envs.PKG_CONFIG_PATH = path.joinenv(PKG_CONFIG_PATH)
     return envs
 end
 
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
index f977475ab..e5b25c450 100644
--- a/xmake/modules/package/tools/meson.lua
+++ b/xmake/modules/package/tools/meson.lua
@@ -78,8 +78,8 @@ function buildenvs(package)
             table.insert(ACLOCAL_PATH, aclocal)
         end
     end
-    envs.ACLOCAL_PATH    = table.concat(ACLOCAL_PATH, path.envsep())
-    envs.PKG_CONFIG_PATH = table.concat(PKG_CONFIG_PATH, path.envsep())
+    envs.ACLOCAL_PATH    = path.joinenv(ACLOCAL_PATH)
+    envs.PKG_CONFIG_PATH = path.joinenv(PKG_CONFIG_PATH)
     return envs
 end