Use CustomizedTool for tools which derive from other tools

[builder.git] / source / androidcompiler.cpp

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index 68c4e56d2ad675a4ac64f72a492f4ff38305e78c..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())
@@ -39,11 +39,14 @@ AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string
                build_info.libs.push_back("gnustl_static");
 }
 
-void AndroidCompiler::do_prepare()
+void AndroidCompiler::do_prepare(ToolData &tool) const
 {
-       GnuCompiler::do_prepare();
+       const Architecture &arch = *static_cast<const Tool &>(tool).get_architecture();
+
+       CustomizedTool::do_prepare(tool);
        if(tag=="CXX")
        {
+               unsigned version = tool.extra_data;
                string version_str = format("%d.%d.%d", version>>16, (version>>8)&0xFF, version&0xFF);
                FS::Path libstdcxx_dir = ndk.get_root_dir()/"sources"/"cxx-stl"/"gnu-libstdc++";
                FS::Path libstdcxx_path;
@@ -56,7 +59,7 @@ void AndroidCompiler::do_prepare()
                        string::size_type dot = version_str.rfind('.');
                        if(dot==string::npos)
                        {
-                               problems.push_back("C++ standard library not found");
+                               tool.problems.push_back("C++ standard library not found");
                                return;
                        }
 
@@ -64,16 +67,16 @@ void AndroidCompiler::do_prepare()
                }
 
                FS::Path public_dir = libstdcxx_path/"include";
-               system_path.push_back(public_dir);
-               build_info.incpath.push_back(public_dir);
+               tool.system_path.push_back(public_dir);
+               tool.build_info.incpath.push_back(public_dir);
 
                FS::Path arch_path = libstdcxx_path/"libs";
-               builder.get_logger().log("files", format("Traversing %s", arch_path.str()));
-               string arch_dir = architecture->best_match(list_files(arch_path));
+               builder.get_logger().log("files", "Traversing %s", arch_path.str());
+               string arch_dir = arch.best_match(list_files(arch_path));
                if(!arch_dir.empty())
                {
-                       build_info.incpath.push_back(libstdcxx_path/"libs"/arch_dir/"include");
-                       build_info.libpath.push_back(libstdcxx_path/"libs"/arch_dir);
+                       tool.build_info.incpath.push_back(libstdcxx_path/"libs"/arch_dir/"include");
+                       tool.build_info.libpath.push_back(libstdcxx_path/"libs"/arch_dir);
                }
        }
 }