Drop the extraneous comma in "-Wl,-R,/dir" and turn it into "-Wl,-R/dir".

Do the same for options that look like "-Wl,-L,/dir".

1 files changed, 15 insertions, 1 deletions

diff --git a/mk/wrapper/logic b/mk/wrapper/logic
index b9314e1e089..84a969dc3dc 100644
--- a/mk/wrapper/logic
+++ b/mk/wrapper/logic
@@ -1,4 +1,4 @@
-# $NetBSD: logic,v 1.5 2004/09/26 19:11:50 danw Exp $
+# $NetBSD: logic,v 1.6 2004/10/08 21:53:53 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -93,6 +93,20 @@ while ! queue_is_empty argbuf; do
 			$debug_log $wrapperlog "    (logic) pre:  -L$dir"
 			;;
 		######################################################
+		# Remove extraneous comma in "-Wl,-R,/dir" and in
+		# "-Wl,-L,/dir".
+		######################################################
+		-Wl,-L,*)
+			arg="-Wl,-L${arg#-Wl,-L,}"
+			$debug_log $wrapperlog "    (logic) pre:  $arg"
+			prepend_queue argbuf "$arg"
+			;;
+		-Wl,-R,*)
+			arg="-Wl,-R${arg#-Wl,-R,}"
+			$debug_log $wrapperlog "    (logic) pre:  $arg"
+			prepend_queue argbuf "$arg"
+			;;
+		######################################################
 		# Merge "-Wl,-R -Wl,/dir" into a single "-Wl,-R/dir".
 		# Same for -Wl,-L, -Wl,-rpath and -Wl,-rpath-link.
 		######################################################