Use combined -L option form for extra system search paths

The split one was just too much of an eye-sore in the logs.

1 files changed, 20 insertions, 8 deletions

diff --git a/libbuild2/utility.hxx b/libbuild2/utility.hxx
index b534f41..151b409 100644
--- a/libbuild2/utility.hxx
+++ b/libbuild2/utility.hxx
@@ -877,17 +877,29 @@ namespace build2
   //
   template <typename I, typename F>
   void
-  append_option_values (cstrings&,
-                        const char* opt,
-                        I begin, I end,
-                        F&& get = [] (const string& s) {return s.c_str ();});
+  append_option_values (
+    cstrings&,
+    const char* opt,
+    I begin, I end,
+    F&& get = [] (const string& s) {return s.c_str ();});
 
   template <typename I, typename F>
   void
-  append_option_values (sha256&,
-                        const char* opt,
-                        I begin, I end,
-                        F&& get = [] (const string& s) {return s;});
+  append_option_values (
+    sha256&,
+    const char* opt,
+    I begin, I end,
+    F&& get = [] (const string& s) -> const string& {return s;});
+
+  // As above but in a combined form (e.g., -L/usr/local/lib).
+  //
+  template <typename I, typename F>
+  void
+  append_combined_option_values (
+    strings&,
+    const char* opt,
+    I begin, I end,
+    F&& get = [] (const string& s) -> const string& {return s;});
 
   // As above but append a single option (used for append/hash uniformity).
   //