X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fandroidcompiler.cpp;fp=source%2Fandroidcompiler.cpp;h=db089b2f9f332f3d42a03f42575dce0add6ddae2;hb=68ef01e3f94ba5d0297e7979551e7d9404906db7;hp=63fd5273a05ec96925d07530853dabbedd359209;hpb=1009314aed27a555033e743f84a1e4347d0bad69;p=builder.git

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index 63fd527..db089b2 100644
--- a/source/androidcompiler.cpp
+++ b/source/androidcompiler.cpp
@@ -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();
+
+	GnuCompiler::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", "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);
 		}
 	}
 }