From b8cac842b0ade0844dddb5e17dc26f0c66a78bbb Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 3 Jan 2023 14:17:31 +0200
Subject: [PATCH] Make the clang and android plugins require gnutools

---
 plugins/android/androidplugin.cpp | 1 +
 plugins/clang/clangplugin.cpp     | 6 ++++++
 plugins/clang/clangplugin.h       | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/android/androidplugin.cpp b/plugins/android/androidplugin.cpp
index 055a0d8..5fc357e 100644
--- a/plugins/android/androidplugin.cpp
+++ b/plugins/android/androidplugin.cpp
@@ -7,6 +7,7 @@
 AndroidPlugin::AndroidPlugin(Builder &b):
 	Plugin(b)
 {
+	required_plugins.push_back("gnutools");
 	builder.get_component_registry().register_type<AndroidApplicationComponent>("android_application");
 }
 
diff --git a/plugins/clang/clangplugin.cpp b/plugins/clang/clangplugin.cpp
index eecbdc6..96a1df8 100644
--- a/plugins/clang/clangplugin.cpp
+++ b/plugins/clang/clangplugin.cpp
@@ -1,6 +1,12 @@
 #include "clangplugin.h"
 #include "clangtools.h"
 
+ClangPlugin::ClangPlugin(Builder &b):
+	Plugin(b)
+{
+	required_plugins.push_back("gnutools");
+}
+
 void ClangPlugin::add_tools(Toolchain &toolchain, const Architecture &arch) const
 {
 	toolchain.add_toolchain(new ClangTools(builder, arch));
diff --git a/plugins/clang/clangplugin.h b/plugins/clang/clangplugin.h
index 678d7b5..b2cd08e 100644
--- a/plugins/clang/clangplugin.h
+++ b/plugins/clang/clangplugin.h
@@ -6,7 +6,7 @@
 class ClangPlugin: public Plugin
 {
 public:
-	ClangPlugin(Builder &b): Plugin(b) { }
+	ClangPlugin(Builder &);
 
 	void add_tools(Toolchain &, const Architecture &) const override;
 };
-- 
2.43.0