summaryrefslogtreecommitdiff
path: root/xmake/modules/package/manager/system
diff options
context:
space:
mode:
authorruki <[email protected]>2024-08-18 22:54:18 +0800
committerruki <[email protected]>2024-08-23 08:14:32 +0800
commit3000c00cfabfed31edd9e9a67d64045f5de7e589 (patch)
tree9b63dde886a3abb8ff3ba36c3c1caee1be3e9e07 /xmake/modules/package/manager/system
parent9b81b86e21ce132cc3a4d03b1868c2a7748c8345 (diff)
install toolchain packages first
Diffstat (limited to 'xmake/modules/package/manager/system')
-rw-r--r--xmake/modules/package/manager/system/find_package.lua30
1 files changed, 0 insertions, 30 deletions
diff --git a/xmake/modules/package/manager/system/find_package.lua b/xmake/modules/package/manager/system/find_package.lua
index 4d939e495..632db0c63 100644
--- a/xmake/modules/package/manager/system/find_package.lua
+++ b/xmake/modules/package/manager/system/find_package.lua
@@ -38,26 +38,6 @@ function _get_package_items()
return items
end
--- check package toolchains
-function _check_package_toolchains(package)
- local has_standalone
- if package:toolchains() then
- for _, toolchain_inst in ipairs(package:toolchains()) do
- if toolchain_inst:check() and toolchain_inst:is_standalone() then
- has_standalone = true
- end
- end
- else
- -- we need also check platform toolchain, perhaps it has a different platform arch.
- -- @see https://github.com/xmake-io/xmake/issues/4043#issuecomment-2102486249
- local platform_inst = platform.load(package:plat(), package:arch())
- if platform_inst:check() then
- has_standalone = true
- end
- end
- return has_standalone
-end
-
-- find package from system and compiler
-- @see https://github.com/xmake-io/xmake/issues/4596
--
@@ -80,16 +60,6 @@ function main(name, opt)
end
snippet_configs.links = snippet_configs.links or name
- -- We need to check package toolchain first
- -- https://github.com/xmake-io/xmake/issues/4596#issuecomment-2014528801
- --
- -- But if it depends on some toolchain packages,
- -- then they can't be detected early in the fetch and we have to disable system.find_package
- local package = opt.package
- if package and not _check_package_toolchains(package) then
- return
- end
-
local snippet_opt = {
verbose = opt.verbose,
target = opt.package,