Fix initialization of Android tools' commands

diff --git a/source/androidarchiver.cpp b/source/androidarchiver.cpp
index 5b869de2ff6e1e5b863c69fa41f9ab23d35f4bca..617445cb8dacb9e421587ece78484755e39c7e0c 100644 (file)
--- a/source/androidarchiver.cpp
+++ b/source/androidarchiver.cpp
@@ -4,6 +4,7 @@
 AndroidArchiver::AndroidArchiver(Builder &b, const Architecture &a, const AndroidNdk &ndk):
        CustomizedTool(b, "AR", a)
 {
+       set_command("ar", true);
        if(ndk.get_root_dir().empty())
                problems.push_back("Android NDK not found");
        else if(ndk.get_bin_dir().empty())

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index 139d743a016d0c65a2acef29b47b3aba13a2a7ab..07047937f41a1010d009349f8b46c2ccd6604051 100644 (file)
--- a/source/androidcompiler.cpp
+++ b/source/androidcompiler.cpp
@@ -16,6 +16,7 @@ AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string
        CustomizedTool(b, t, a),
        ndk(n)
 {
+       set_command((tag=="CXX" ? "g++" : "gcc"), true);
        if(ndk.get_root_dir().empty())
                problems.push_back("Android NDK not found");
        else if(ndk.get_bin_dir().empty())

diff --git a/source/androidlinker.cpp b/source/androidlinker.cpp
index 9629bb7df02ad5058f498f08bb18010731590ef6..ec9024996c5b7358236047e4553e908e2432067f 100644 (file)
--- a/source/androidlinker.cpp
+++ b/source/androidlinker.cpp
@@ -7,6 +7,9 @@ AndroidLinker::AndroidLinker(Builder &b, const Architecture &a, const AndroidNdk
        CustomizedTool(b, "LINK", a)
 {
        build_info.sysroot = ndk.get_platform_sysroot();
+
+       set_command("gcc", true);
+       set_command((ndk.get_bin_dir()/command).str());
 }
 
 Target *AndroidLinker::create_target(const vector<Target *> &sources, const string &)