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

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index db089b2..0704793 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())
@@ -43,7 +44,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;