X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=9e7eb390220d451dabac88c0a971ba698c095e97;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=2928cbfe21b30c88ea0b1d8a538ade7449b2f443;hpb=c3968651eb8a2ba66a95398f0571dd5afd37225c;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 2928cbf..9e7eb39 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -69,7 +69,7 @@ Target *GnuCompiler::create_source(const FS::Path &path) const
 		return new CSourceFile(builder, path);
 }
 
-Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
+Target *GnuCompiler::create_target(const vector<Target *> &sources, const string &)
 {
 	if(sources.size()!=1)
 		throw invalid_argument("GnuCompiler::create_target");
@@ -84,13 +84,14 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 	if(!executable)
 		return string();
 
-	string result = FS::basename(executable->get_path());
+	string result = Tool::create_build_signature(binfo);
 	if(!architecture->get_cpu().empty())
 	{
 		result += ",m";
 		result += architecture->get_cpu();
 	}
-	result += ',';
+	if(binfo.debug || binfo.optimize)
+		result += ',';
 	if(binfo.debug)
 		result += 'g';
 	if(binfo.optimize)
@@ -162,7 +163,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()));
 	}
 }