X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=06ad5a9d7e0037735cbc89c18bb2709bd7053070;hb=c51e8844f19c31b2809ba459a1659d3b94a86f89;hp=a3052df1a6d4a4b2041ec5940e75239d4f6ffccf;hpb=486adc75285b8b5d62a990dd9f9cd4737c8ab7f6;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index a3052df..06ad5a9 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -67,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");
@@ -99,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)
@@ -119,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();