X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fandroidcompiler.cpp;h=cdd98af34f5095dd853521535091e5b37e0fc4e8;hp=e45715e5a7313068ff66663406473f1e52608565;hb=d774d554c4c15b963215212b26a9ee5df3d705e8;hpb=f41742cb2b21241634c123561b71ee1667cb1ff4

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index e45715e..cdd98af 100644
--- a/source/androidcompiler.cpp
+++ b/source/androidcompiler.cpp
@@ -25,6 +25,13 @@ 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();