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

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 3903c6a079983975fa42cc468c6552fd32cf1a4f..26570c702602978a286d9c146a689b5fe515d9e8 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -72,7 +72,7 @@ Target *GnuCompiler::create_source(const FS::Path &path) const
 Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
 {
        if(sources.size()!=1)
-               throw invalid_argument("GnuCCompiler::create_target");
+               throw invalid_argument("GnuCompiler::create_target");
        SourceFile &source = dynamic_cast<SourceFile &>(*sources.front());
        ObjectFile *obj = new ObjectFile(builder, *source.get_component(), source);
        obj->set_tool(*this);
@@ -162,7 +162,7 @@ void GnuCompiler::prepare_syspath()
                else if(architecture->is_native())
                        system_path.push_back("/usr/include");
                else
-                       system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
+                       system_path.push_back(format("/usr/%s/include", architecture->get_cross_prefix()));
        }
 }