Use CustomizedTool for tools which derive from other tools

diff --git a/source/androidarchiver.cpp b/source/androidarchiver.cpp
index 58cbefa9f9ea8abbf03195f3f951e074ead5ec71..5b869de2ff6e1e5b863c69fa41f9ab23d35f4bca 100644 (file)
--- a/source/androidarchiver.cpp
+++ b/source/androidarchiver.cpp
@@ -2,7 +2,7 @@
 #include "androidtools.h"
 
 AndroidArchiver::AndroidArchiver(Builder &b, const Architecture &a, const AndroidNdk &ndk):
-       GnuArchiver(b, a)
+       CustomizedTool(b, "AR", a)
 {
        if(ndk.get_root_dir().empty())
                problems.push_back("Android NDK not found");

diff --git a/source/androidarchiver.h b/source/androidarchiver.h
index e09ccecb68168a2838ce41bfe9cae9e5d67a1789..a39fe541ef606b5601ee8f704bec5dd7cc7eaaa8 100644 (file)
--- a/source/androidarchiver.h
+++ b/source/androidarchiver.h
@@ -1,11 +1,11 @@
 #ifndef ANDROIDARCHIVER_H_
 #define ANDROIDARCHIVER_H_
 
-#include "gnuarchiver.h"
+#include "customizedtool.h"
 
 class AndroidNdk;
 
-class AndroidArchiver: public GnuArchiver
+class AndroidArchiver: public CustomizedTool
 {
 public:
        AndroidArchiver(Builder &, const Architecture &, const AndroidNdk &);

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index db089b2f9f332f3d42a03f42575dce0add6ddae2..139d743a016d0c65a2acef29b47b3aba13a2a7ab 100644 (file)
--- a/source/androidcompiler.cpp
+++ b/source/androidcompiler.cpp
@@ -13,7 +13,7 @@ using namespace std;
 using namespace Msp;
 
 AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string &t, const AndroidNdk &n):
-       GnuCompiler(b, &a, t),
+       CustomizedTool(b, t, a),
        ndk(n)
 {
        if(ndk.get_root_dir().empty())
@@ -43,7 +43,7 @@ void AndroidCompiler::do_prepare(ToolData &tool) const
 {
        const Architecture &arch = *static_cast<const Tool &>(tool).get_architecture();
 
-       GnuCompiler::do_prepare(tool);
+       CustomizedTool::do_prepare(tool);
        if(tag=="CXX")
        {
                unsigned version = tool.extra_data;

diff --git a/source/androidcompiler.h b/source/androidcompiler.h
index 9f42099eb8477cc28640260ccea2bd44bd8eb2e9..86dfa2734019161098157f44f9ea8b6374c9eb40 100644 (file)
--- a/source/androidcompiler.h
+++ b/source/androidcompiler.h
@@ -1,11 +1,11 @@
 #ifndef ANDROIDCOMPILER_H_
 #define ANDROIDCOMPILER_H_
 
-#include "gnucompiler.h"
+#include "customizedtool.h"
 
 class AndroidNdk;
 
-class AndroidCompiler: public GnuCompiler
+class AndroidCompiler: public CustomizedTool
 {
 private:
        const AndroidNdk &ndk;

diff --git a/source/androidlinker.cpp b/source/androidlinker.cpp
index 2cacf38cb2bacd864d35ab73c4b18fe98bee2b01..9629bb7df02ad5058f498f08bb18010731590ef6 100644 (file)
--- a/source/androidlinker.cpp
+++ b/source/androidlinker.cpp
@@ -4,12 +4,12 @@
 using namespace std;
 
 AndroidLinker::AndroidLinker(Builder &b, const Architecture &a, const AndroidNdk &ndk):
-       GnuLinker(b, a)
+       CustomizedTool(b, "LINK", a)
 {
        build_info.sysroot = ndk.get_platform_sysroot();
 }
 
 Target *AndroidLinker::create_target(const vector<Target *> &sources, const string &)
 {
-       return GnuLinker::create_target(sources, "shared");
+       return CustomizedTool::create_target(sources, "shared");
 }

diff --git a/source/androidlinker.h b/source/androidlinker.h
index 269d1687d91472016f49f3e555bdd3d9bf385fbd..7418d3ce583a9cd65bc95952f3dbb34a794e208b 100644 (file)
--- a/source/androidlinker.h
+++ b/source/androidlinker.h
@@ -1,11 +1,11 @@
 #ifndef ANDROIDLINKER_H_
 #define ANDROIDLINKER_H_
 
-#include "gnulinker.h"
+#include "customizedtool.h"
 
 class AndroidNdk;
 
-class AndroidLinker: public GnuLinker
+class AndroidLinker: public CustomizedTool
 {
 public:
        AndroidLinker(Builder &, const Architecture &, const AndroidNdk &);

diff --git a/source/clangcompiler.cpp b/source/clangcompiler.cpp
index f0ab93916a8a91c24a2c7b4ae1740ec367189ea6..bcd73d1b151e1c23829067e977502ba85f919623 100644 (file)
--- a/source/clangcompiler.cpp
+++ b/source/clangcompiler.cpp
@@ -4,7 +4,7 @@ using namespace std;
 using namespace Msp;
 
 ClangCompiler::ClangCompiler(Builder &b, const Architecture &a, const string &t):
-       GnuCompiler(b, a, t)
+       CustomizedTool(b, t, a)
 {
        set_command((tag=="CXX" ? "clang++" : "clang"), true);
 }

diff --git a/source/clangcompiler.h b/source/clangcompiler.h
index 656b9d20dff4be43b2f8148eef5957fd3c9d50b4..af2c05d27a9c0cf926c56ee6aa9f55986d66d7c2 100644 (file)
--- a/source/clangcompiler.h
+++ b/source/clangcompiler.h
@@ -1,9 +1,9 @@
 #ifndef CLANGCOMPILER_H_
 #define CLANGCOMPILER_H_
 
-#include "gnucompiler.h"
+#include "customizedtool.h"
 
-class ClangCompiler: public GnuCompiler
+class ClangCompiler: public CustomizedTool
 {
 public:
        ClangCompiler(Builder &, const Architecture &, const std::string &);