X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=5209317dc0fd4b544bfc66b292c6beebd77080d6;hb=d6e5645659cc31231e6da5028ddd0e0aeca19218;hp=62a7e32dcd1c879be0d55bb25075a2b04f676189;hpb=338eefb513953ae55e8e3614c009c242ba8ad74e;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 62a7e32..5209317 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,5 +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"
@@ -12,16 +14,18 @@ using namespace std;
 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
+	Tool(b, t)
 {
-	return new SourceFile(builder, comp, path);
+	executable = builder.get_vfs().find_binary(n);
+
+	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
+Target *GnuCompiler::create_target(const list<Target *> &sources, const string &) const
 {
 	if(sources.size()!=1)
 		throw invalid_argument("GnuCCompiler::create_target");
@@ -36,19 +40,44 @@ Task *GnuCompiler::run(const Target &target) const
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
 	const Component &comp = object.get_component();
 
-	vector<string> argv;
-	argv.push_back(name);
+	ExternalTask::Arguments argv;
+	argv.push_back(executable->get_path().str());
 	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();
+	if(arch.get_bits()!=native_arch.get_bits())
+		argv.push_back(format("-m%d", arch.get_bits()));
+
+	const string &cpu = arch.get_cpu();
+	if(!cpu.empty())
+		argv.push_back("-march="+cpu);
 
 	FS::Path obj_path = object.get_path();
 	FS::Path src_path = object.get_source().get_path();