summaryrefslogtreecommitdiff
path: root/tools/minicargo/build.cpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2017-08-24 12:18:11 +0800
committerJohn Hodge <tpg@mutabah.net>2017-08-24 12:18:11 +0800
commit80e78c5316ea393cdae8155f35a36c456364ebf9 (patch)
tree7be0b620cf0b37f47e691c2c9fb8802b2e46f2c2 /tools/minicargo/build.cpp
parenta906d0b00e2af9faa6b628dc0006398e98808aae (diff)
downloadmrust-80e78c5316ea393cdae8155f35a36c456364ebf9.tar.gz
minicargo - Some extended debugging (and a fix to optional deps)
Diffstat (limited to 'tools/minicargo/build.cpp')
-rw-r--r--tools/minicargo/build.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/minicargo/build.cpp b/tools/minicargo/build.cpp
index d0c31db8..b6096b30 100644
--- a/tools/minicargo/build.cpp
+++ b/tools/minicargo/build.cpp
@@ -201,17 +201,20 @@ void MiniCargo_Build(const PackageManifest& manifest, ::helpers::path override_p
void BuildList::add_dependencies(const PackageManifest& p, unsigned level)
{
+ TRACE_FUNCTION_F(p.name());
for (const auto& dep : p.dependencies())
{
if( dep.is_optional() )
{
continue ;
}
+ DEBUG("Depenency " << dep.name());
add_package(dep.get_package(), level+1);
}
}
void BuildList::add_package(const PackageManifest& p, unsigned level)
{
+ TRACE_FUNCTION_F(p.name());
// If the package is already loaded
for(auto& ent : m_list)
{
@@ -223,10 +226,7 @@ void BuildList::add_package(const PackageManifest& p, unsigned level)
// Keep searching (might already have a higher entry)
}
m_list.push_back({ &p, level });
- for (const auto& dep : p.dependencies())
- {
- add_package(dep.get_package(), level+1);
- }
+ add_dependencies(p, level);
}
void BuildList::sort_list()
{