Improve problem reporting for the Android toolchain

[builder.git] / source / androidcompiler.cpp

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index 3616cf450686ec5c1c10ad74592883d33f2ccb00..01daa2a65c6ea2318bcf0a6f79366945e2309575 100644 (file)
--- a/source/androidcompiler.cpp
+++ b/source/androidcompiler.cpp
@@ -16,7 +16,16 @@ AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string
        GnuCompiler(b, a, t, n.get_platform_sysroot()),
        ndk(n)
 {
-       set_command((ndk.get_bin_dir()/command).str());
+       if(ndk.get_root_dir().empty())
+               problems.push_back("Android NDK not found");
+       else if(ndk.get_bin_dir().empty())
+               problems.push_back("Android NDK toolchain not found");
+       else
+               set_command((ndk.get_bin_dir()/command).str());
+
+       if(ndk.get_platform_sysroot().empty())
+               problems.push_back("Android platform not found");
+
        build_info.incpath.insert(build_info.incpath.end(), system_path.begin(), system_path.end());
        if(tag=="CXX")
                build_info.libs.push_back("gnustl_static");