summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2004-01-27 08:23:45 +0000
committerjlam <jlam>2004-01-27 08:23:45 +0000
commit99b2fb74125db71819595730e7c402c15d33e0fd (patch)
tree8d9dcd4bcb202f759671e6bbb701b3cb9d9d5fcc /mk
parent5ae9f542ac72055addb4755c8e3f02eadc175452 (diff)
downloadpkgsrc-99b2fb74125db71819595730e7c402c15d33e0fd.tar.gz
Also break up -R*:* into separate -R options.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink3/buffer9
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/buildlink3/buffer b/mk/buildlink3/buffer
index 52a91a79732..65e562f16d6 100644
--- a/mk/buildlink3/buffer
+++ b/mk/buildlink3/buffer
@@ -1,4 +1,4 @@
-# $NetBSD: buffer,v 1.3 2004/01/07 17:40:36 jlam Exp $
+# $NetBSD: buffer,v 1.4 2004/01/27 08:23:45 jlam Exp $
#
# Fill the buffer if it's empty, and shift the arguments. The next
# argument checked by the cache and logic files is taken from the
@@ -17,15 +17,16 @@ case ${buf1}${buf2}${buf3}${buf4}${buf5} in
# Fill the buffers from $arg.
#
case $arg in
- -Wl,-R*:*|-Wl,-rpath,*:*|-Wl,-rpath-link,*:*|\
+ -R*:*|-Wl,-R*:*|-Wl,-rpath,*:*|-Wl,-rpath-link,*:*|\
-Wl,--rpath,*:*|-Wl,--rpath-link,*:*)
#
- # Change "-Wl,-R/path1:/path2:/path3" into
- # "-Wl,-R/path1 -Wl,-R/path2 -Wl,-R/path3" so that
+ # Change "-<rpath_flag>/path1:/path2" into
+ # "-<rpath_flag>/path1 -<rpath_flag>/path2" so that
# they can be checked correctly in the cache and logic
# files.
#
case $arg in
+ -R*) R="-R" ;;
-Wl,-R*) R="-Wl,-R" ;;
-Wl,-rpath,*) R="-Wl,-rpath," ;;
-Wl,-rpath-link,*) R="-Wl,-rpath-link," ;;