Rework Tool::prepare to be able to work on other objects than self

[builder.git] / source / gnucompiler.h

diff --git a/source/gnucompiler.h b/source/gnucompiler.h
index 8521a1fc300684d652f8c007eb3c3d8d2911d80c..54e1d76cdf27d9644fe2707f786d56f861dae0d1 100644 (file)
--- a/source/gnucompiler.h
+++ b/source/gnucompiler.h
@@ -14,9 +14,6 @@ appropriate type.
 */
 class GnuCompiler: public Tool
 {
-protected:
-       unsigned version;
-
 public:
        GnuCompiler(Builder &, const Architecture &, const std::string &);
 
@@ -25,10 +22,10 @@ public:
        Target *create_target(const std::vector<Target *> &, const std::string &) override;
        std::string create_build_signature(const BuildInfo &) const override;
 protected:
-       void do_prepare() override;
-       void prepare_syspath();
-       void prepare_version();
-       unsigned query_version(const std::string &) 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 Task *_run(const ObjectFile &);