X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=a73fad72765d65be8d88730e25b3570d5925cb8d;hb=c3fa3cda6a700d739872025194e9a6b530ac8764;hp=0bd1b33274028384fbfb6fd5127ead017493f67f;hpb=03227882aef8b448065e6ca9cda9b7722b7a9753;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 0bd1b33..a73fad7 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -40,6 +40,11 @@ Target *GnuCompiler::create_target(const list<Target *> &sources, const string &
 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';
@@ -74,7 +79,6 @@ Task *GnuCompiler::run(const Target &target) const
 			argv.push_back("-pedantic");
 			argv.push_back("-Wno-long-long");
 			argv.push_back("-Wshadow");
-			argv.push_back("-Winline");
 			if(tag=="CC")
 			{
 				argv.push_back("-Wc++-compat");
@@ -88,6 +92,7 @@ Task *GnuCompiler::run(const Target &target) const
 			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");