Use format() when creating strings from more than two parts

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index c592cc86cf1e7bd888eefa753957f5988bea2e0b..61332b2452a3e39069d2f1084008fb199b838c7c 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -174,7 +174,7 @@ void GnuLinker::do_prepare()
                        }
                }
                else
-                       system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/lib");
+                       system_path.push_back(format("/usr/%s/lib", architecture->get_cross_prefix()));
        }
 }
 
@@ -232,7 +232,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
 {
        const Binary &bin = dynamic_cast<const Binary &>(target);
 
-       vector<string> argv;
+       ExternalTask::Arguments argv;
        argv.push_back(executable->get_path().str());
 
        FS::Path work_dir = bin.get_component()->get_package().get_source_directory();
@@ -337,7 +337,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
        {
                if(compiler_tag=="CXX")
                {
-                       BuildInfo::LibModeMap::const_iterator i = binfo.libmodes.find("stdc++");
+                       auto i = binfo.libmodes.find("stdc++");
                        if(i!=binfo.libmodes.end() && i->second<=BuildInfo::STATIC)
                                argv.push_back("-static-libstdc++");
                }