Adjust build signatures to contain the tool tag

[builder.git] / source / gnuarchiver.cpp

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index cc4359e90071235a57df19c0ac59a3a58fd12088..742278de668653f17895abab2e6d003fc9698e16 100644 (file)
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -16,7 +16,9 @@ using namespace Msp;
 GnuArchiver::GnuArchiver(Builder &b, const Architecture &a):
        Tool(b, a, "AR")
 {
+       set_command("ar", true);
        input_suffixes.push_back(".o");
+       processing_unit = COMPONENT;
 }
 
 Target *GnuArchiver::create_target(const list<Target *> &sources, const string &)
@@ -25,9 +27,9 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
                throw invalid_argument("GnuArchiver::create_target");
 
        list<ObjectFile *> objs;
-       for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+       for(Target *s: sources)
        {
-               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(s))
                        objs.push_back(obj);
                else
                        throw invalid_argument("GnuArchiver::create_target");
@@ -39,11 +41,6 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
        return lib;
 }
 
-void GnuArchiver::do_prepare()
-{
-       set_executable("ar", true);
-}
-
 Task *GnuArchiver::run(const Target &target) const
 {
        const StaticLibrary &lib = dynamic_cast<const StaticLibrary &>(target);
@@ -57,9 +54,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<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);