X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fgnucompiler.cpp;h=3f5121997dbe2d8322b9561ea9cbcaca668663d1;hb=740d7cdd71fc2f068e44bfc6c8cc7e9565de16f6;hp=36903937546a678f07e59e4bc2f101ddcb47b474;hpb=d66acc8fb6b17f1f966838a5266a04be551a284e;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 3690393..3f51219 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -37,6 +37,20 @@ Target *GnuCompiler::create_target(const list<Target *> &sources, const string &
 	return obj;
 }
 
+string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
+{
+	string result = FS::basename(executable->get_path());
+	result += ',';
+	if(binfo.debug)
+		result += 'g';
+	if(binfo.optimize)
+	{
+		result += 'O';
+		result += (binfo.optimize>0 ? '0'+binfo.optimize : 's');
+	}
+	return result;
+}
+
 Task *GnuCompiler::run(const Target &target) const
 {
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
@@ -47,8 +61,37 @@ Task *GnuCompiler::run(const Target &target) const
 	argv.push_back("-c");
 
 	const BuildInfo &binfo = comp.get_build_info();
-	for(BuildInfo::WordList::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
-		argv.push_back("-W"+*i);
+	if(binfo.warning_level>=1)
+	{
+		argv.push_back("-Wall");
+		if(binfo.warning_level>=2)
+		{
+			argv.push_back("-Wextra");
+			argv.push_back("-Wundef");
+		}
+		if(binfo.warning_level>=3)
+		{
+			argv.push_back("-pedantic");
+			argv.push_back("-Wno-long-long");
+			argv.push_back("-Wshadow");
+			if(tag=="CC")
+			{
+				argv.push_back("-Wc++-compat");
+				argv.push_back("-Wstrict-prototypes");
+			}
+		}
+		if(binfo.warning_level>=4)
+		{
+			// Some truly paranoid warnings
+			argv.push_back("-Wstrict-overflow=4");
+			argv.push_back("-Wfloat-equal");
+			argv.push_back("-Wconversion");
+			argv.push_back("-Wwrite-strings");
+			argv.push_back("-Winline");
+		}
+		if(binfo.fatal_warnings)
+			argv.push_back("-Werror");
+	}
 	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)
@@ -82,7 +125,7 @@ Task *GnuCompiler::run(const Target &target) const
 
 	FS::Path obj_path = object.get_path();
 	FS::Path src_path = object.get_source().get_path();
-	FS::Path work_dir = comp.get_package().get_source();
+	FS::Path work_dir = comp.get_package().get_source_directory();
 
 	argv.push_back("-o");
 	argv.push_back(relative(obj_path, work_dir).str());