X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=16e24c0090c5bf43a45cd3d69a0559ddcb56acd9;hb=3f0f721;hp=da579ba5d0c132caf0b7c09d17e87bd3281e762e;hpb=6e02286dcbd62b8f5ef56987c2298d54b689ad9c;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index da579ba..16e24c0 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 <msp/strings/utils.h>
 #include "architecture.h"
 #include "builder.h"
 #include "component.h"
@@ -51,6 +52,26 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 	return result;
 }
 
+void GnuCompiler::do_prepare()
+{
+	executable = builder.get_vfs().find_binary(command);
+	if(executable)
+	{
+		ExternalTask::Arguments argv;
+		argv.push_back(executable->get_path().str());
+		argv.push_back("-dumpversion");
+
+		builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+		try
+		{
+			version = strip(ExternalTask::run_and_capture_output(argv));
+			builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
+		}
+		catch(const runtime_error &)
+		{ }
+	}
+}
+
 Task *GnuCompiler::run(const Target &target) const
 {
 	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
@@ -60,7 +81,9 @@ Task *GnuCompiler::run(const Target &target) const
 	argv.push_back(executable->get_path().str());
 	argv.push_back("-c");
 
-	const BuildInfo &binfo = comp.get_build_info_for_path(object.get_source().get_path());
+	BuildInfo binfo;
+	target.collect_build_info(binfo);
+
 	if(binfo.warning_level>=1)
 	{
 		argv.push_back("-Wall");
@@ -121,7 +144,7 @@ Task *GnuCompiler::run(const Target &target) const
 		argv.push_back("-fPIC");
 
 	const Architecture &native_arch = builder.get_native_arch();
-	if(architecture->get_bits()!=native_arch.get_bits())
+	if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
 		argv.push_back(format("-m%d", architecture->get_bits()));
 
 	const string &cpu = architecture->get_cpu();