From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 26 Dec 2022 18:36:19 +0000 (+0200)
Subject: Fix initialization of Android tools' commands
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=354bb72645fed7f560d909bd6487933526cba036;p=builder.git

Fix initialization of Android tools' commands
---

diff --git a/source/androidarchiver.cpp b/source/androidarchiver.cpp
index 5b869de..617445c 100644
--- 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 139d743..0704793 100644
--- 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 9629bb7..ec90249 100644
--- 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 &)