From c5c351d30d66c9076c11fa0166a23b9b2ec7baea Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Wed, 6 Mar 2024 23:32:32 +0000
Subject: link mode: argument vector: remove no-op (past all -l args) linker
 path args.

---
 src/logic/linkcmd/slbt_linkcmd_argv.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/logic/linkcmd/slbt_linkcmd_argv.c b/src/logic/linkcmd/slbt_linkcmd_argv.c
index 71cf2a1..e4f0d12 100644
--- a/src/logic/linkcmd/slbt_linkcmd_argv.c
+++ b/src/logic/linkcmd/slbt_linkcmd_argv.c
@@ -999,12 +999,25 @@ slbt_hidden int slbt_exec_link_finalize_argument_vector(
 	for (; src<cap; )
 		*dst++ = *src++;
 
-	/* join all other args */
+	/* join all other args, eliminate no-op linker path args */
 	src = aargv;
 	cap = aarg;
 
-	for (; src<cap; )
-		*dst++ = *src++;
+	for (; src<cap; ) {
+		if ((src[0][0] == '-') && (src[0][1] == 'L')) {
+			for (larg=0,rarg=src; *rarg && !larg; rarg++)
+				if ((rarg[0][0] == '-') && (rarg[0][1] == 'l'))
+					larg = rarg;
+
+			if (larg) {
+				*dst++ = *src++;
+			} else {
+				src++;
+			}
+		} else {
+			*dst++ = *src++;
+		}
+	}
 
 	/* properly null-terminate argv, accounting for redundant -l arguments */
 	*dst = 0;
-- 
cgit v1.2.3