Bump version to 3.0 and update copyright years

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 0d730a4a30f3a26dd3dc1e50b92f15db54481ef8..56becc2c42ef0f6f9f32f30f7ba910213a077212 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -39,22 +39,19 @@ GnuLinker::~GnuLinker()
        delete cxx_linker;
 }
 
-Target *GnuLinker::create_target(const list<Target *> &sources, const string &arg)
+Target *GnuLinker::create_target(const vector<Target *> &sources, const string &arg)
 {
        if(sources.empty())
                throw invalid_argument("GnuLinker::create_target");
-       list<ObjectFile *> objs;
+       vector<ObjectFile *> objs;
+       objs.reserve(sources.size());
        Linker *linker = default_linker;
        for(Target *s: sources)
        {
-               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(s))
-               {
-                       objs.push_back(obj);
-                       if(obj->get_tool()->get_tag()=="CXX")
-                               linker = cxx_linker;
-               }
-               else
-                       throw invalid_argument("GnuLinker::create_target");
+               ObjectFile &obj = dynamic_cast<ObjectFile &>(*s);
+               objs.push_back(&obj);
+               if(obj.get_tool()->get_tag()=="CXX")
+                       linker = cxx_linker;
        }
 
        const Component &comp = *objs.front()->get_component();
@@ -114,7 +111,7 @@ void GnuLinker::do_prepare()
                        if(!sysroot.empty())
                                argv.push_back("--sysroot="+sysroot.str());
 
-                       builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+                       builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
                        try
                        {
                                string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
@@ -141,7 +138,7 @@ void GnuLinker::do_prepare()
                                        }
 
                                        path /= output.substr(search_dir, end-search_dir);
-                                       builder.get_logger().log("tools", format("Got %s system path: %s", tag, path));
+                                       builder.get_logger().log("tools", "Got %s system path: %s", tag, path);
                                        system_path.push_back(path);
                                        path_found = true;
 
@@ -155,7 +152,7 @@ void GnuLinker::do_prepare()
 
        if(!path_found)
        {
-               builder.get_logger().log("tools", format("No %s system path found, using defaults", tag));
+               builder.get_logger().log("tools", "No %s system path found, using defaults", tag);
                if(!sysroot.empty())
                        system_path.push_back(sysroot/"usr/lib");
                else if(architecture->is_native())