Redesign GnuLinker to work without subtools

[builder.git] / source / gnulinker.h

diff --git a/source/gnulinker.h b/source/gnulinker.h
index 872234a6d33d645a36676309172c4c58e948a15d..c04afd1ffb580c2c618a107cec69e0cafbc20ff5 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
@@ -12,32 +14,16 @@ Uses either gcc or g++ depending on what was used to compile the object files.
 */
 class GnuLinker: public Tool
 {
-private:
-       class Linker: public SubTool
-       {
-       private:
-               std::string compiler_tag;
-
-       public:
-               Linker(GnuLinker &, const std::string &);
-
-               virtual std::string create_build_signature(const BuildInfo &) const;
-       private:
-               virtual void do_prepare();
-       public:
-               virtual Task *run(const Target &) const;
-       };
-
-       Linker *default_linker;
-       Linker *cxx_linker;
-
 public:
-       GnuLinker(Builder &, const Architecture &, const Msp::FS::Path & = Msp::FS::Path());
-       ~GnuLinker();
+       GnuLinker(Builder &, const Architecture &);
 
-       virtual Target *create_target(const std::list<Target *> &, const std::string &);
-       virtual Target *create_install(Target &) const;
-       virtual Task *run(const Target &) const;
+       Target *create_target(const std::vector<Target *> &, const std::string &) override;
+       Target *create_install(Target &) const override;
+       std::string create_build_signature(const BuildInfo &) const override;
+protected:
+       void do_prepare() override;
+private:
+       static Task *_run(const Binary &);
 };
 
 #endif