diff options
| author | joerg <joerg> | 2009-01-09 11:46:34 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-01-09 11:46:34 +0000 |
| commit | 0daf6781ee83c990a6126c423b87fca1596f5033 (patch) | |
| tree | e8a5e1ad4402a7fd5640f631afdc664324dffd47 /mk | |
| parent | 2453ff0d200384963e465c4b27775d2bed5a5621 (diff) | |
| download | pkgsrc-0daf6781ee83c990a6126c423b87fca1596f5033.tar.gz | |
Further refine AIX support. From Jens Rehsack.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/compiler/xlc.mk | 4 | ||||
| -rw-r--r-- | mk/wrapper/cmd-sink-aix-cc | 16 | ||||
| -rw-r--r-- | mk/wrapper/cmd-sink-aix-xlc | 16 |
3 files changed, 30 insertions, 6 deletions
diff --git a/mk/compiler/xlc.mk b/mk/compiler/xlc.mk index 8983d4af511..09e0fda6bac 100644 --- a/mk/compiler/xlc.mk +++ b/mk/compiler/xlc.mk @@ -1,4 +1,4 @@ -# $NetBSD: xlc.mk,v 1.21 2008/12/29 21:26:55 joerg Exp $ +# $NetBSD: xlc.mk,v 1.22 2009/01/09 11:46:34 joerg Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -135,7 +135,7 @@ ${_XLC_CPP}: ${RUN}${MKDIR} ${.TARGET:H} ${RUN} \ (${ECHO} '#!${TOOLS_SHELL}'; \ - ${ECHO} 'exec ${XLCBASE}/bin/xlc -E @$$@"'; \ + ${ECHO} 'exec ${XLCBASE}/bin/xlc -E "$$@"'; \ ) > ${.TARGET} ${RUN}${CHMOD} +x ${.TARGET} diff --git a/mk/wrapper/cmd-sink-aix-cc b/mk/wrapper/cmd-sink-aix-cc index 7d1923364a6..2dfbff16811 100644 --- a/mk/wrapper/cmd-sink-aix-cc +++ b/mk/wrapper/cmd-sink-aix-cc @@ -1,4 +1,4 @@ -# $NetBSD: cmd-sink-aix-cc,v 1.4 2008/12/29 16:53:06 joerg Exp $ +# $NetBSD: cmd-sink-aix-cc,v 1.5 2009/01/09 11:46:34 joerg Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -75,13 +75,25 @@ while ! queue_is_empty cmdbuf; do dynamic=yes ;; -rpath) - pop_queue argbuf dir + pop_queue cmdbuf dir case $blibpath in "") blibpath="$dir" ;; *) blibpath="$blibpath:$dir" ;; esac $debug_log $wrapperlog " (cmd-sink-aix-cc) drop: $dir [adding to blibpath]" ;; + -shared) + arg="-bshared" + . $buildcmd + ;; + -Wl,-soname*) + arg=-brtl + . $buildcmd + arg=-Wl,-G + . $buildcmd + arg=-Wl,-bexpall + . $buildcmd + ;; *) . $buildcmd ;; diff --git a/mk/wrapper/cmd-sink-aix-xlc b/mk/wrapper/cmd-sink-aix-xlc index 8288a814f2a..ae8b9f118d7 100644 --- a/mk/wrapper/cmd-sink-aix-xlc +++ b/mk/wrapper/cmd-sink-aix-xlc @@ -1,4 +1,4 @@ -# $NetBSD: cmd-sink-aix-xlc,v 1.8 2008/12/29 16:53:06 joerg Exp $ +# $NetBSD: cmd-sink-aix-xlc,v 1.9 2009/01/09 11:46:34 joerg Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -71,13 +71,25 @@ while ! queue_is_empty cmdbuf; do ;; # GCC and xlC allow -rpath directly, so keep this behavior. -rpath) - pop_queue argbuf dir + pop_queue cmdbuf dir case $blibpath in "") blibpath="$dir" ;; *) blibpath="$blibpath:$dir" ;; esac $debug_log $wrapperlog " (cmd-sink-aix-xlc) drop: $dir [adding to blibpath]" ;; + -shared) + arg="-bshared" + . $buildcmd + ;; + -Wl,-soname*) + arg=-brtl + . $buildcmd + arg=-Wl,-G + . $buildcmd + arg=-Wl,-bexpall + . $buildcmd + ;; *) . $buildcmd ;; |