summaryrefslogtreecommitdiff
path: root/xmake/modules/package/tools/autoconf.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2024-03-31 18:38:06 +0800
committerGitHub <[email protected]>2024-03-31 18:38:06 +0800
commit7b1058df4ae787b9a5df4a96edf0dc8fc30910b0 (patch)
treefe158ce656ef8656000c1867517ca4a60584dfaf /xmake/modules/package/tools/autoconf.lua
parent62fbe909667a1849bd55321ac37d0f294d9eb797 (diff)
Update autoconf.lua
Diffstat (limited to 'xmake/modules/package/tools/autoconf.lua')
-rw-r--r--xmake/modules/package/tools/autoconf.lua13
1 files changed, 6 insertions, 7 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
index 473024a95..f7a847ce0 100644
--- a/xmake/modules/package/tools/autoconf.lua
+++ b/xmake/modules/package/tools/autoconf.lua
@@ -28,7 +28,7 @@ import("core.cache.memcache")
import("lib.detect.find_tool")
-- translate paths
-function _translate_paths(package, paths)
+function _translate_paths(paths)
if paths and is_host("windows") then
if type(paths) == "string" then
return path.unix(paths)
@@ -123,7 +123,7 @@ function _get_configs(package, configs)
-- add prefix
local configs = configs or {}
- table.insert(configs, "--prefix=" .. _translate_paths(package, package:installdir()))
+ table.insert(configs, "--prefix=" .. _translate_paths(package:installdir()))
-- add host for cross-complation
if not configs.host and _is_cross_compilation(package) then
@@ -188,8 +188,8 @@ function _get_cflags_from_packagedeps(package, opt)
local fetchinfo = dep:fetch({external = false})
if fetchinfo then
table.join2(result, _map_compflags(package, "cxx", "define", fetchinfo.defines))
- table.join2(result, _translate_paths(package, _map_compflags(package, "cxx", "includedir", fetchinfo.includedirs)))
- table.join2(result, _translate_paths(package, _map_compflags(package, "cxx", "sysincludedir", fetchinfo.sysincludedirs)))
+ table.join2(result, _translate_paths(_map_compflags(package, "cxx", "includedir", fetchinfo.includedirs)))
+ table.join2(result, _translate_paths(_map_compflags(package, "cxx", "sysincludedir", fetchinfo.sysincludedirs)))
end
end
end
@@ -204,9 +204,9 @@ function _get_ldflags_from_packagedeps(package, opt)
if dep then
local fetchinfo = dep:fetch({external = false})
if fetchinfo then
- table.join2(result, _translate_paths(package, _map_linkflags(package, "binary", {"cxx"}, "linkdir", fetchinfo.linkdirs)))
+ table.join2(result, _translate_paths(_map_linkflags(package, "binary", {"cxx"}, "linkdir", fetchinfo.linkdirs)))
table.join2(result, _map_linkflags(package, "binary", {"cxx"}, "link", fetchinfo.links))
- table.join2(result, _translate_paths(package, _map_linkflags(package, "binary", {"cxx"}, "syslink", fetchinfo.syslinks)))
+ table.join2(result, _translate_paths(_map_linkflags(package, "binary", {"cxx"}, "syslink", fetchinfo.syslinks)))
table.join2(result, _map_linkflags(package, "binary", {"cxx"}, "framework", fetchinfo.frameworks))
end
end
@@ -578,4 +578,3 @@ function install(package, configs, opt)
end
make(package, argv, opt)
end
-