Improve problem reporting for the Android toolchain

[builder.git] / source / androidarchiver.cpp

diff --git a/source/androidarchiver.cpp b/source/androidarchiver.cpp
index 71bc5ffb120ffbab86191b884e6d60c2b518fef5..58cbefa9f9ea8abbf03195f3f951e074ead5ec71 100644 (file)
--- a/source/androidarchiver.cpp
+++ b/source/androidarchiver.cpp
@@ -4,5 +4,10 @@
 AndroidArchiver::AndroidArchiver(Builder &b, const Architecture &a, const AndroidNdk &ndk):
        GnuArchiver(b, a)
 {
-       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());
 }