From 63bd5b82459036c647a521efb2c8668ceb520ec5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 7 Jun 2024 08:08:36 +0200
Subject: Use combined -L option form for extra system search paths

The split one was just too much of an eye-sore in the logs.
---
 libbuild2/cc/link-rule.cxx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'libbuild2/cc')

diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index 6b0c337..417cba5 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -3479,13 +3479,19 @@ namespace build2
 
           append_args (sargs1);
         }
-        else
+        else if (b != x)
         {
-          append_option_values (
-            args,
+          // Use the more canonical combined form (-L/usr/local/lib) even
+          // though it's less efficient (the split one is just too much of an
+          // eye-sore in the logs).
+          //
+          append_combined_option_values (
+            sargs1,
             "-L",
             b, x,
-            [] (const dir_path& d) {return d.string ().c_str ();});
+            [] (const dir_path& d) -> const string& {return d.string ();});
+
+          append_args (sargs1);
         }
       }
 
-- 
cgit v1.1