create the tools when everything else is ready

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index cc4796cdee867cd9d9aea23d311951d4f091965a..11d2925d83514ce4849f08fcff0bf6a9d92c8f9e 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -61,9 +61,9 @@ void Component::create_build_info()
 
        build_info.update_from(pkg.get_build_info());
 
-       for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+       for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
                *i = (pkg.get_source() / *i).str();
-       for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
+       for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
                *i = (pkg.get_source() / *i).str();
 
        if(pkg.get_library_mode()!=DYNAMIC)
@@ -77,8 +77,6 @@ void Component::create_build_info()
 
        if(type==PROGRAM)
                build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
-
-       build_info.unique();
 }
 
 void Component::create_targets() const
@@ -275,7 +273,7 @@ void Component::Loader::source(const string &s)
 
 void Component::Loader::require(const string &n)
 {
-       Package *req = comp.pkg.get_builder().get_package(n);
+       Package *req = comp.pkg.get_builder().get_package_manager().find_package(n);
        if(req)
                comp.requires.push_back(req);
 }