diff options
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 9 | ||||
| -rw-r--r-- | mk/wrapper/cmd-sink-sunpro-cxx | 61 |
2 files changed, 69 insertions, 1 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 925ee210ddf..15c2626d083 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.32 2005/05/20 22:40:36 rillig Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.33 2005/07/06 03:31:24 grant Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -256,6 +256,7 @@ _WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC} .endif .if !empty(PKGSRC_COMPILER:Msunpro) +_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 _WRAP_CACHE_BODY.CXX= ${_WRAP_CACHE_BODY.CC} @@ -541,6 +542,12 @@ ${WRAPPER_TMPDIR}/transform-mipspro-ucode-cc: \ ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} \ | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET} +${WRAPPER_TMPDIR}/cmd-sink-sunpro-cxx: \ + ${WRAPPER_SRCDIR}/cmd-sink-sunpro-cxx + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} + ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} \ + | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET} + ${WRAPPER_TMPDIR}/transform-sunpro-cc: \ ${WRAPPER_SRCDIR}/transform-sunpro-cc ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} diff --git a/mk/wrapper/cmd-sink-sunpro-cxx b/mk/wrapper/cmd-sink-sunpro-cxx new file mode 100644 index 00000000000..ee4be358f3d --- /dev/null +++ b/mk/wrapper/cmd-sink-sunpro-cxx @@ -0,0 +1,61 @@ +# $NetBSD: cmd-sink-sunpro-cxx,v 1.1 2005/07/06 03:31:24 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. + +# if we are linking a shared library, ensure that the C++ runtime +# libraries are linked so that all symbols can be resolved at runtime. +shlib= +libCstd= +libCrun= + +while ! queue_is_empty cmdbuf; do + pop_queue cmdbuf arg + $debug_log $wrapperlog " (cmd-sink-sunpro-cxx) pop: $arg" + case $arg in + -G) shlib=yes ;; + -lCstd) libCstd=yes ;; + -lCrun) libCrun=yes ;; + esac + . $buildcmd +done + +if $test -n "$shlib"; then + if $test "$libCstd" != yes; then + arg=-lCstd + $debug_log $wrapperlog " (cmd-sink-sunpro-cxx) pop: $arg" + . $buildcmd + fi + if $test "$libCrun" != yes; then + arg=-lCrun + $debug_log $wrapperlog " (cmd-sink-sunpro-cxx) pop: $arg" + . $buildcmd + fi +fi |