X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=5ecd29307fc9ac8339cc95090dddaf228e6beaed;hb=ca18323d45d67243773b03668e79c715aa976441;hp=026ec8c8a015c08b40ef8e8b74edc37a8c12ed36;hpb=4240871c17854e2afccdcc37ce8f3464f8091a3f;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 026ec8c..5ecd293 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,6 +1,7 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include "architecture.h"
 #include "builder.h"
 #include "component.h"
 #include "externaltask.h"
@@ -15,11 +16,12 @@ using namespace Msp;
 GnuCompiler::GnuCompiler(Builder &b, const string &t, const string &n):
 	Tool(b, t),
 	name(n)
-{ }
-
-Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
 {
-	return new SourceFile(builder, comp, path);
+	const Architecture &arch = builder.get_current_arch();
+	if(arch.is_native())
+		system_path.push_back("/usr/include");
+	else
+		system_path.push_back("/usr/"+arch.get_cross_prefix()+"/include");
 }
 
 Target *GnuCompiler::create_target(const list<Target *> &sources, const std::string &) const
@@ -37,19 +39,35 @@ Task *GnuCompiler::run(const Target &target) const
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
 	const Component &comp = object.get_component();
 
-	vector<string> argv;
+	ExternalTask::Arguments argv;
 	argv.push_back(name);
 	argv.push_back("-c");
 
 	const BuildInfo &binfo = comp.get_build_info();
-	for(list<string>::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
+	for(BuildInfo::WordList::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
 		argv.push_back("-W"+*i);
-	for(list<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
-		argv.push_back(*i);
-	for(list<string>::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-		argv.push_back("-I"+*i);
-	for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
-		argv.push_back("-D"+*i);
+	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)
+	{
+		if(i->second.empty())
+			argv.push_back(format("-D%s", i->first));
+		else
+			argv.push_back(format("-D%s=%s", i->first, i->second));
+	}
+	if(binfo.debug)
+		argv.push_back("-ggdb");
+	if(binfo.optimize)
+	{
+		if(binfo.optimize<0)
+			argv.push_back("-Os");
+		else
+			argv.push_back(format("-O%d", binfo.optimize));
+	}
+	if(binfo.threads)
+		argv.push_back("-pthread");
+	if(comp.get_type()==Component::LIBRARY)
+		argv.push_back("-fPIC");
 
 	const Architecture &arch = builder.get_current_arch();
 	const Architecture &native_arch = builder.get_native_arch();