X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidcompiler.cpp;h=2321f033c0844504d8005f087d42428ee8cb0c15;hb=e2c9c3fffcc61a0c102ccf6a7924e2de709092ad;hp=db089b2f9f332f3d42a03f42575dce0add6ddae2;hpb=68ef01e3f94ba5d0297e7979551e7d9404906db7;p=builder.git

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index db089b2..2321f03 100644
--- a/source/androidcompiler.cpp
+++ b/source/androidcompiler.cpp
@@ -13,9 +13,10 @@ 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)
 {
+	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())
@@ -34,18 +35,17 @@ AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string
 	}
 	else
 		build_info.sysroot = ndk.get_platform_sysroot();
-
-	if(tag=="CXX")
-		build_info.libs.push_back("gnustl_static");
 }
 
 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")
 	{
+		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++";
@@ -66,6 +66,8 @@ void AndroidCompiler::do_prepare(ToolData &tool) const
 			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";
 		tool.system_path.push_back(public_dir);
 		tool.build_info.incpath.push_back(public_dir);