From d867bea8765d546abdbad08a3e573a88a8553b1c Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 26 Oct 2023 23:09:00 +0800 Subject: pass linkorders for packages --- xmake/core/package/package.lua | 1 + xmake/modules/package/manager/xmake/find_package.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index bbc303929..1ba408ff7 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1736,6 +1736,7 @@ function _instance:find_package(name, opt) mode = self:mode(), plat = self:plat(), arch = self:arch(), + linkorders = self:get("linkorders"), configs = table.join(self:configs(), opt.configs), components = self:components_orderlist(), components_extsources = opt.components_extsources, diff --git a/xmake/modules/package/manager/xmake/find_package.lua b/xmake/modules/package/manager/xmake/find_package.lua index 18d686409..0d5336fe4 100644 --- a/xmake/modules/package/manager/xmake/find_package.lua +++ b/xmake/modules/package/manager/xmake/find_package.lua @@ -353,5 +353,6 @@ function main(name, opt) if not result and opt.packagedirs then result = _find_package_from_packagedirs(name, opt) end + return result end -- cgit v1.3.1