X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=a3052df1a6d4a4b2041ec5940e75239d4f6ffccf;hb=50baabc242633d531d3f9542e9a64491b6e12c6c;hp=a6d27052e292e032123e4d5f1e7fbb94aa03c333;hpb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index a6d2705..a3052df 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -20,6 +20,8 @@ GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, con
 	if(architecture->is_cross())
 		command = format("%s-%s", architecture->get_cross_prefix(), command);
 	executable = builder.get_vfs().find_binary(command);
+	if(!executable)
+		builder.problem(string(), format("Can't find executable %s for tool %s", command, tag));
 
 	if(architecture->is_native())
 		system_path.push_back("/usr/include");
@@ -37,6 +39,25 @@ 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());
+	if(!architecture->get_cpu().empty())
+	{
+		result += ",m";
+		result += architecture->get_cpu();
+	}
+	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 +68,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)
@@ -88,8 +138,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);
 }