X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=06ad5a9d7e0037735cbc89c18bb2709bd7053070;hb=b1c51196b34f644e821f351c2acdb48619aed2e3;hp=3f5121997dbe2d8322b9561ea9cbcaca668663d1;hpb=824c28d552668240b98a353acdcc284a477d8b19;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 3f51219..06ad5a9 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -20,6 +20,8 @@ GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, con
 	if(architecture->is_cross())
 		command = format("%s-%s", architecture->get_cross_prefix(), command);
 	executable = builder.get_vfs().find_binary(command);
+	if(!executable)
+		builder.problem(string(), format("Can't find executable %s for tool %s", command, tag));
 
 	if(architecture->is_native())
 		system_path.push_back("/usr/include");
@@ -40,6 +42,11 @@ Target *GnuCompiler::create_target(const list<Target *> &sources, const string &
 string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 {
 	string result = FS::basename(executable->get_path());
+	if(!architecture->get_cpu().empty())
+	{
+		result += ",m";
+		result += architecture->get_cpu();
+	}
 	result += ',';
 	if(binfo.debug)
 		result += 'g';
@@ -60,7 +67,7 @@ Task *GnuCompiler::run(const Target &target) const
 	argv.push_back(executable->get_path().str());
 	argv.push_back("-c");
 
-	const BuildInfo &binfo = comp.get_build_info();
+	const BuildInfo &binfo = comp.get_build_info_for_path(object.get_source().get_path());
 	if(binfo.warning_level>=1)
 	{
 		argv.push_back("-Wall");
@@ -92,6 +99,11 @@ Task *GnuCompiler::run(const Target &target) const
 		if(binfo.fatal_warnings)
 			argv.push_back("-Werror");
 	}
+	for(BuildInfo::PathList::const_iterator i=binfo.local_incpath.begin(); i!=binfo.local_incpath.end(); ++i)
+	{
+		argv.push_back("-iquote");
+		argv.push_back(i->str());
+	}
 	for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
 		argv.push_back("-I"+i->str());
 	for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
@@ -112,7 +124,7 @@ Task *GnuCompiler::run(const Target &target) const
 	}
 	if(binfo.threads)
 		argv.push_back("-pthread");
-	if(comp.get_type()==Component::LIBRARY && architecture->get_system()!="windows")
+	if((comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE) && architecture->get_system()!="windows")
 		argv.push_back("-fPIC");
 
 	const Architecture &native_arch = builder.get_native_arch();
@@ -131,8 +143,5 @@ Task *GnuCompiler::run(const Target &target) const
 	argv.push_back(relative(obj_path, work_dir).str());
 	argv.push_back(relative(src_path, work_dir).str());
 
-	if(!builder.get_dry_run())
-		FS::mkpath(FS::dirname(obj_path), 0755);
-
 	return new ExternalTask(argv, work_dir);
 }