X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=da579ba5d0c132caf0b7c09d17e87bd3281e762e;hb=7bcd4fef81679dedcabc5a58b12511a6b52c4fe4;hp=a73fad72765d65be8d88730e25b3570d5925cb8d;hpb=1f65cfa34ee95345d2107bac8ff03f0e587bb311;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index a73fad7..da579ba 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -13,21 +13,16 @@
 using namespace std;
 using namespace Msp;
 
-GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const string &c):
+GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
 	Tool(b, a, t)
 {
-	string command = c;
-	if(architecture->is_cross())
-		command = format("%s-%s", architecture->get_cross_prefix(), command);
-	executable = builder.get_vfs().find_binary(command);
-
 	if(architecture->is_native())
 		system_path.push_back("/usr/include");
 	else
 		system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
 }
 
-Target *GnuCompiler::create_target(const list<Target *> &sources, const string &) const
+Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
 {
 	if(sources.size()!=1)
 		throw invalid_argument("GnuCCompiler::create_target");
@@ -65,7 +60,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");
@@ -97,6 +92,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)
@@ -115,9 +115,9 @@ Task *GnuCompiler::run(const Target &target) const
 		else
 			argv.push_back(format("-O%d", binfo.optimize));
 	}
-	if(binfo.threads)
+	if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin")
 		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();
@@ -136,8 +136,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);
 }