strip leading "-Qoption ld" from -R args for sunpro C++ compiler, to

avoid duplicate "-Qoption ld" args when the -R args is later stripped.

thanks to jlam@ for the hint.

2 files changed, 66 insertions, 1 deletions

diff --git a/mk/wrapper/arg-pp-sunpro-cxx b/mk/wrapper/arg-pp-sunpro-cxx
new file mode 100644
index 00000000000..75410159786
--- /dev/null
+++ b/mk/wrapper/arg-pp-sunpro-cxx
@@ -0,0 +1,58 @@
+# $NetBSD: arg-pp-sunpro-cxx,v 1.1 2005/08/20 14:37:53 grant Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Grant Beattie.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+case $arg in
+-Qoption)
+	argmatch=no
+	pop_queue argbuf nextarg1
+	$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pop:  $nextarg1"
+	case $nextarg1 in
+	ld)
+		argmatch=yes
+		pop_queue argbuf nextarg2
+		$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pop:  $nextarg2"
+		case $nextarg2 in
+		-R*)
+			$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pre:  $nextarg2"
+			prepend_queue argbuf $nextarg2
+			;;
+		*)
+			$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pre:  $nextarg2"
+			prepend_queue argbuf $nextarg2
+			$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pre:  $nextarg1"
+			prepend_queue argbuf $nextarg1
+			;;
+		esac
+		;;
+	esac
+	;;
+esac
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index 579eeab47fa..be4f3b50dac 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.36 2005/07/26 07:36:54 grant Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.37 2005/08/20 14:37:53 grant Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -256,6 +256,7 @@ _WRAP_TRANSFORM.CXX=	${_WRAP_TRANSFORM.CC}
 .endif
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
+_WRAP_ARG_PP.CXX=	${WRAPPER_TMPDIR}/arg-pp-sunpro-cxx
 _WRAP_CMD_SINK.CXX=	${WRAPPER_TMPDIR}/cmd-sink-sunpro-cxx
 _WRAP_CACHE_BODY.CC=	${WRAPPER_TMPDIR}/cache-body-sunpro-cc
 _WRAP_TRANSFORM.CC=	${WRAPPER_TMPDIR}/transform-sunpro-cc
@@ -467,6 +468,12 @@ ${WRAPPER_TMPDIR}/arg-pp-mipspro-cc:					\
 	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
+${WRAPPER_TMPDIR}/arg-pp-sunpro-cxx:					\
+		${WRAPPER_SRCDIR}/arg-pp-sunpro-cxx
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
 ${WRAPPER_TMPDIR}/cmd-sink-aix-xlc:					\
 		${WRAPPER_SRCDIR}/cmd-sink-aix-xlc
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}