pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Also merge -Wl,-R -Wl,/path/to/dir into ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/df8d5406f520
branches:  trunk
changeset: 466304:df8d5406f520
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jan 15 09:59:29 2004 +0000

description:
Also merge -Wl,-R -Wl,/path/to/dir into a single argument so that we can
look it up in the cache.

diffstat:

 mk/buildlink3/marshall |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 0366b08998c7 -r df8d5406f520 mk/buildlink3/marshall
--- a/mk/buildlink3/marshall    Thu Jan 15 09:57:50 2004 +0000
+++ b/mk/buildlink3/marshall    Thu Jan 15 09:59:29 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: marshall,v 1.6 2003/11/25 14:44:39 jlam Exp $
+# $NetBSD: marshall,v 1.7 2004/01/15 09:59:29 jlam Exp $
 #
 # Handle cases where multiple consecutive arguments must be processed
 # together, either by merging the arguments or "skipping" the extra
@@ -6,9 +6,15 @@
 #
 case $arg in
 #
-# Merge "-Wl,--rpath -Wl,/path/to/dir" into a single argument
-# "-Wl,--rpath,/path/to/dir" so that we can look it up in the cache.
+# Merge "-Wl,R -Wl,/path/to/dir" into a single argument
+# "-Wl,R/path/to/dir" and merge "-Wl,--rpath -Wl,/path/to/dir" into
+# "-Wl,--rpath,/path/to/dir" so that we can look them up in the cache.
 #
+-Wl,-R)
+       nextarg=`$echo "X$1" | $Xsed -e "s|^-Wl,||g"`
+       arg="$arg$nextarg"
+       shift
+       ;;
 -Wl,-rpath|-Wl,-rpath-link|\
 -Wl,--rpath|-Wl,--rpath-link)
        nextarg=`$echo "X$1" | $Xsed -e "s|^-Wl,||g"`



Home | Main Index | Thread Index | Old Index