processing_unit = COMPONENT;
}
-Target *GnuArchiver::create_target(const list<Target *> &sources, const string &)
+Target *GnuArchiver::create_target(const vector<Target *> &sources, const string &)
{
if(sources.empty())
throw invalid_argument("GnuArchiver::create_target");
- list<ObjectFile *> objs;
- for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
- {
- if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
- objs.push_back(obj);
- else
- throw invalid_argument("GnuArchiver::create_target");
- }
+ vector<ObjectFile *> objs;
+ objs.reserve(sources.size());
+ for(Target *s: sources)
+ objs.push_back(&dynamic_cast<ObjectFile &>(*s));
const Component &comp = *objs.front()->get_component();
StaticLibrary *lib = new StaticLibrary(builder, comp, objs);
return lib;
}
-string GnuArchiver::create_build_signature(const BuildInfo &) const
-{
- return FS::basename(executable->get_path());
-}
-
Task *GnuArchiver::run(const Target &target) const
{
const StaticLibrary &lib = dynamic_cast<const StaticLibrary &>(target);
argv.push_back(relative(lib.get_path(), work_dir).str());
- const Target::Dependencies &deps = lib.get_dependencies();
- for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
- if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+ for(Target *d: lib.get_dependencies())
+ if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
argv.push_back(relative(obj->get_path(), work_dir).str());
return new ExternalTask(argv, work_dir);