Redesign how tools are run

[builder.git] / source / gnulinker.h

diff --git a/source/gnulinker.h b/source/gnulinker.h
index 8c380c85ae9beb95c02c1c68645a1b580458c85d..713b978064747ab570b15f9cbc764ddaa149b014 100644 (file)
--- a/source/gnulinker.h
+++ b/source/gnulinker.h
@@ -3,6 +3,8 @@
 
 #include "tool.h"
 
+class Binary;
+
 /**
 The GNU linker.  Turns ObjectFiles into Executables and SharedLibraries.  To
 create a shared library, specify "shared" as the second argument to
@@ -15,23 +17,31 @@ class GnuLinker: public Tool
 private:
        class Linker: public SubTool
        {
+       private:
+               std::string compiler_tag;
+
        public:
                Linker(GnuLinker &, const std::string &);
 
-               virtual Target *create_target(const std::list<Target *> &, const std::string &) const;
-               virtual std::string create_build_signature(const BuildInfo &) const;
-               virtual Task *run(const Target &) const;
+               std::string create_build_signature(const BuildInfo &) const override;
+       private:
+               void do_prepare() override;
+
+       public:
+               static Task *_run(const Binary &);
        };
 
-       Linker *default_linker;
-       Linker *cxx_linker;
+       Linker *default_linker = 0;
+       Linker *cxx_linker = 0;
 
 public:
        GnuLinker(Builder &, const Architecture &);
        ~GnuLinker();
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &) const;
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::vector<Target *> &, const std::string &) override;
+       Target *create_install(Target &) const override;
+protected:
+       void do_prepare() override;
 };
 
 #endif