X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=24a022febd10e1a0ed711bfee58782a99ad75880;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=7e79ec08d7749efab9a52567df947b2fdf64f545;hpb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;p=builder.git diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp index 7e79ec0..24a022f 100644 --- a/source/gnuarchiver.cpp +++ b/source/gnuarchiver.cpp @@ -21,19 +21,15 @@ GnuArchiver::GnuArchiver(Builder &b, const Architecture &a): processing_unit = COMPONENT; } -Target *GnuArchiver::create_target(const list &sources, const string &) +Target *GnuArchiver::create_target(const vector &sources, const string &) { if(sources.empty()) throw invalid_argument("GnuArchiver::create_target"); - list objs; + vector objs; + objs.reserve(sources.size()); for(Target *s: sources) - { - if(ObjectFile *obj = dynamic_cast(s)) - objs.push_back(obj); - else - throw invalid_argument("GnuArchiver::create_target"); - } + objs.push_back(&dynamic_cast(*s)); const Component &comp = *objs.front()->get_component(); StaticLibrary *lib = new StaticLibrary(builder, comp, objs); @@ -41,11 +37,6 @@ Target *GnuArchiver::create_target(const list &sources, const string & 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(target);