X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=7e79ec08d7749efab9a52567df947b2fdf64f545;hb=3043044d8ef02ef77def454fdede87927f5aa1f8;hp=158a4d4fee9f70c359d4e22ea1c6255aa82c098f;hpb=000deb52a1374bcedfec5d201c53c1842438ceba;p=builder.git diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp index 158a4d4..7e79ec0 100644 --- a/source/gnuarchiver.cpp +++ b/source/gnuarchiver.cpp @@ -18,6 +18,7 @@ GnuArchiver::GnuArchiver(Builder &b, const Architecture &a): { set_command("ar", true); input_suffixes.push_back(".o"); + processing_unit = COMPONENT; } Target *GnuArchiver::create_target(const list &sources, const string &) @@ -26,9 +27,9 @@ Target *GnuArchiver::create_target(const list &sources, const string & throw invalid_argument("GnuArchiver::create_target"); list objs; - for(list::const_iterator i=sources.begin(); i!=sources.end(); ++i) + for(Target *s: sources) { - if(ObjectFile *obj = dynamic_cast(*i)) + if(ObjectFile *obj = dynamic_cast(s)) objs.push_back(obj); else throw invalid_argument("GnuArchiver::create_target"); @@ -58,9 +59,8 @@ Task *GnuArchiver::run(const Target &target) const 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(*i)) + for(Target *d: lib.get_dependencies()) + if(ObjectFile *obj = dynamic_cast(d)) argv.push_back(relative(obj->get_path(), work_dir).str()); return new ExternalTask(argv, work_dir);