naoki: Fix dependency tree resolution in toolchain stage.

diff --git a/naoki/backend.py b/naoki/backend.py
index 0d5cb4dcd087ad05f3a2b9086e4e6395a07c3441..1fde02c186c4a17860e613baef81e4e54355f104 100644 (file)
--- a/naoki/backend.py
+++ b/naoki/backend.py
@@ -86,7 +86,7 @@ def depsolve(packages, recursive=False, build=False, toolchain=False):
                length = len(deps)
                for dep in deps[:]:
                        deps.extend(dep.dependencies)
-                       if build:
+                       if build and not toolchain:
                                deps.extend(dep.dependencies_build)
 
                new_deps = []
@@ -292,7 +292,7 @@ class PackageInfo(object):
                deps = self.dependencies
                if not self.__toolchain:
                        deps.extend(self.dependencies_build)
-               return depsolve(deps, build=True, recursive=True)
+               return depsolve(deps, build=True, recursive=True, toolchain=self.__toolchain)
 
        @property
        def dependencies_toolchain(self):