X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.h;h=b0d0ec9e0afc040edfdc722d5979c0a12ebe6d42;hb=edd4771292a2273080fbcbac266c6831834b0b86;hp=9f0304d82daa0408c4ae3817b36d7b828a5d4ee7;hpb=7777d548fddca66b21f26273faedfdf675b10234;p=builder.git

diff --git a/source/gnucompiler.h b/source/gnucompiler.h
index 9f0304d..b0d0ec9 100644
--- a/source/gnucompiler.h
+++ b/source/gnucompiler.h
@@ -3,6 +3,8 @@
 
 #include "tool.h"
 
+class ObjectFile;
+
 /**
 Common base class for GNU compilers.  Turns SourceFiles into ObjectFiles.
 
@@ -12,18 +14,21 @@ appropriate type.
 */
 class GnuCompiler: public Tool
 {
-protected:
-	std::string version;
-
+public:
 	GnuCompiler(Builder &, const Architecture &, const std::string &);
 
-public:
-	virtual Target *create_target(const std::list<Target *> &, const std::string &);
-	virtual std::string create_build_signature(const BuildInfo &) const;
+	Target *create_source(const Component &, const Msp::FS::Path &) const override;
+	Target *create_source(const Msp::FS::Path &) const override;
+	Target *create_target(const std::vector<Target *> &, const std::string &) override;
+	std::string create_build_signature(const BuildInfo &) const override;
 protected:
-	virtual void do_prepare();
-public:
-	virtual Task *run(const Target &) const;
+	void do_prepare(ToolData &) const override;
+	void prepare_syspath(ToolData &) const;
+	void prepare_version(ToolData &) const;
+	unsigned query_version(const std::string &, const std::string &) const;
+
+private:
+	static ExternalTask::Arguments _run(const ObjectFile &, Msp::FS::Path &);
 };
 
 #endif