From c11bbf8455b065c22c7a2147b33fb6a9c8c43e11 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Mon, 16 Jan 2023 18:17:51 +0100
Subject: Minor changes: Add help text to configure --help, use append(..) and
 strip ctor binary.

---
 src/configure.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/configure.cc')

diff --git a/src/configure.cc b/src/configure.cc
index 3bb2d48..a2bb8bc 100644
--- a/src/configure.cc
+++ b/src/configure.cc
@@ -234,6 +234,7 @@ std::ostream& operator<<(std::ostream& ostr, const ctor::asm_flag& flag)
 template<class> inline constexpr bool always_false_v = false;
 
 int regenerateCache(ctor::settings& settings,
+                    const std::string& name,
                     const std::vector<std::string>& args,
                     const std::map<std::string, std::string>& env)
 {
@@ -388,7 +389,9 @@ int regenerateCache(ctor::settings& settings,
 	opt.add("help", no_argument, 'h',
 	        "Print this help text.",
 	        [&]() {
-		        std::cout << "configure usage stuff\n";
+		        std::cout << "Configure how to build with " << name << "\n";
+		        std::cout << "Usage: " << name << " configure [options]\n\n";
+		        std::cout << "Options:\n";
 		        opt.help();
 		        exit(0);
 		        return 0;
@@ -646,7 +649,7 @@ int configure(const ctor::settings& global_settings, int argc, char* argv[])
 		env["LD"] = ld_env;
 	}
 
-	auto ret = regenerateCache(settings, args, env);
+	auto ret = regenerateCache(settings, argv[0], args, env);
 	if(ret != 0)
 	{
 		return ret;
@@ -688,7 +691,7 @@ int reconfigure(const ctor::settings& global_settings, int argc, char* argv[])
 	}
 	std::cout << "\n";
 
-	auto ret = regenerateCache(settings, cfg.args, cfg.env);
+	auto ret = regenerateCache(settings, argv[0], cfg.args, cfg.env);
 	if(ret != 0)
 	{
 		return ret;
-- 
cgit v1.2.3