summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-12-18 14:00:28 +0800
committerruki <[email protected]>2022-12-18 14:00:28 +0800
commit66991f330fcfe08630fd2c028f45d7a54b5fd7be (patch)
treec41e2df79d45aa596b3aa6aa5c8052fd825b1b0f
parent62ca3cf055e384953da9850e6365212aabf5f319 (diff)
revert fix
-rw-r--r--xmake/core/base/private/instance_deps.lua12
1 files changed, 2 insertions, 10 deletions
diff --git a/xmake/core/base/private/instance_deps.lua b/xmake/core/base/private/instance_deps.lua
index e001505c8..535b2d2bb 100644
--- a/xmake/core/base/private/instance_deps.lua
+++ b/xmake/core/base/private/instance_deps.lua
@@ -32,19 +32,11 @@ local table = require("base/table")
--
-- a.deps = b
-- b.deps = c
--- foo.deps = a d
--
--- orderdeps: c -> b -> d -> a -> foo
---
--- if they're target, their links order is reverse(orderdeps), e.g. foo-> a -> d -> b -> c
+-- orderdeps: c -> b -> a
--
function instance_deps.load_deps(instance, instances, deps, orderdeps, depspath)
- local deps = table.wrap(instance:get("deps"))
- local total = #deps
- for idx, _ in ipairs(deps) do
- -- we reverse to get the flat dependencies in order to ensure the correct linking order
- -- @see https://github.com/xmake-io/xmake/issues/3144
- local dep = deps[total + 1 - idx]
+ for _, dep in ipairs(table.wrap(instance:get("deps"))) do
local depinst = instances[dep]
if depinst then
local depspath_sub