From 9ae890e43e26a651ce564db87b9c0f01f51f5eb8 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 29 Dec 2022 18:34:21 +0200 Subject: [PATCH] Check for existence of Android NDK in AndroidLinker --- plugins/android/androidlinker.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/android/androidlinker.cpp b/plugins/android/androidlinker.cpp index ec90249..8c6e9a4 100644 --- a/plugins/android/androidlinker.cpp +++ b/plugins/android/androidlinker.cpp @@ -6,10 +6,15 @@ using namespace std; AndroidLinker::AndroidLinker(Builder &b, const Architecture &a, const AndroidNdk &ndk): CustomizedTool(b, "LINK", a) { - build_info.sysroot = ndk.get_platform_sysroot(); - set_command("gcc", true); - 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()); + + build_info.sysroot = ndk.get_platform_sysroot(); } Target *AndroidLinker::create_target(const vector &sources, const string &) -- 2.43.0