pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/wrapper Drop the extraneous comma in "-Wl,-R,/dir" ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/aec4307df986
branches: trunk
changeset: 481622:aec4307df986
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Oct 08 21:53:53 2004 +0000
description:
Drop the extraneous comma in "-Wl,-R,/dir" and turn it into "-Wl,-R/dir".
Do the same for options that look like "-Wl,-L,/dir".
diffstat:
mk/wrapper/logic | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diffs (30 lines):
diff -r 065f13c0fc16 -r aec4307df986 mk/wrapper/logic
--- a/mk/wrapper/logic Fri Oct 08 21:02:53 2004 +0000
+++ b/mk/wrapper/logic Fri Oct 08 21:53:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: logic,v 1.5 2004/09/26 19:11:50 danw Exp $
+# $NetBSD: logic,v 1.6 2004/10/08 21:53:53 jlam Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -93,6 +93,20 @@
$debug_log $wrapperlog " (logic) pre: -L$dir"
;;
######################################################
+ # Remove extraneous comma in "-Wl,-R,/dir" and in
+ # "-Wl,-L,/dir".
+ ######################################################
+ -Wl,-L,*)
+ arg="-Wl,-L${arg#-Wl,-L,}"
+ $debug_log $wrapperlog " (logic) pre: $arg"
+ prepend_queue argbuf "$arg"
+ ;;
+ -Wl,-R,*)
+ arg="-Wl,-R${arg#-Wl,-R,}"
+ $debug_log $wrapperlog " (logic) pre: $arg"
+ prepend_queue argbuf "$arg"
+ ;;
+ ######################################################
# Merge "-Wl,-R -Wl,/dir" into a single "-Wl,-R/dir".
# Same for -Wl,-L, -Wl,-rpath and -Wl,-rpath-link.
######################################################
Home |
Main Index |
Thread Index |
Old Index