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)
{
+ set_command((tag=="CXX" ? "g++" : "gcc"), true);
if(ndk.get_root_dir().empty())
problems.push_back("Android NDK not found");
else if(ndk.get_bin_dir().empty())
}
else
build_info.sysroot = ndk.get_platform_sysroot();
-
- if(tag=="CXX")
- 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")
{
+ tool.build_info.libs.push_back("gnustl_static");
+
+ 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;
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;
}
version_str = version_str.substr(0, dot);
}
+ builder.get_logger().log("tools", "Found GNU libstdc++ in %s", libstdcxx_path);
+
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", "Traversing %s", arch_path.str());
- string arch_dir = architecture->best_match(list_files(arch_path));
+ 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);
}
}
}