X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidcompiler.cpp;h=9ae31ac1b0d6d7fd732b188f65a4625c491ab36f;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=01daa2a65c6ea2318bcf0a6f79366945e2309575;hpb=266697cea92aed098fff31c1ddd4a4bfab3a683f;p=builder.git

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index 01daa2a..9ae31ac 100644
--- 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, n.get_platform_sysroot()),
+	GnuCompiler(b, a, t),
 	ndk(n)
 {
 	if(ndk.get_root_dir().empty())
@@ -25,8 +25,16 @@ AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string
 
 	if(ndk.get_platform_sysroot().empty())
 		problems.push_back("Android platform not found");
+	else if(!ndk.get_common_sysroot().empty())
+	{
+		build_info.sysroot = ndk.get_common_sysroot();
+		/* The common sysroot has asm headers in arch directories and the
+		compiler doesn't pick them up automatically */
+		build_info.incpath.push_back(ndk.get_common_sysroot()/"usr/include"/architecture->get_cross_prefix());
+	}
+	else
+		build_info.sysroot = ndk.get_platform_sysroot();
 
-	build_info.incpath.insert(build_info.incpath.end(), system_path.begin(), system_path.end());
 	if(tag=="CXX")
 		build_info.libs.push_back("gnustl_static");
 }
@@ -34,38 +42,25 @@ AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string
 void AndroidCompiler::do_prepare()
 {
 	GnuCompiler::do_prepare();
-	if(executable && tag=="CXX")
+	if(tag=="CXX")
 	{
-		ExternalTask::Arguments argv;
-		argv.push_back(executable->get_path().str());
-		argv.push_back("-dumpversion");
-
-		builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
-		string version;
-		try
-		{
-			version = strip(ExternalTask::run_and_capture_output(argv));
-			builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
-		}
-		catch(const runtime_error &)
-		{ }
-
+		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;
 		while(1)
 		{
-			libstdcxx_path = libstdcxx_dir/version;
+			libstdcxx_path = libstdcxx_dir/version_str;
 			if(FS::exists(libstdcxx_path))
 				break;
 
-			string::size_type dot = version.rfind('.');
+			string::size_type dot = version_str.rfind('.');
 			if(dot==string::npos)
 			{
 				problems.push_back("C++ standard library not found");
 				return;
 			}
 
-			version = version.substr(0, dot);
+			version_str = version_str.substr(0, dot);
 		}
 
 		FS::Path public_dir = libstdcxx_path/"include";
@@ -73,7 +68,7 @@ void AndroidCompiler::do_prepare()
 		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()));
+		builder.get_logger().log("files", "Traversing %s", arch_path.str());
 		string arch_dir = architecture->best_match(list_files(arch_path));
 		if(!arch_dir.empty())
 		{