diff options
| author | jlam <jlam> | 2004-01-17 17:33:49 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-01-17 17:33:49 +0000 |
| commit | 7837519a349b6c2b397c5f59d4d02690330b0c19 (patch) | |
| tree | 431b14e39eda4ca300b0346c970ccc877ca7a9a8 /mk | |
| parent | d7f70d68425f7b9737bc8abfe7cbb72bde63c316 (diff) | |
| download | pkgsrc-7837519a349b6c2b397c5f59d4d02690330b0c19.tar.gz | |
Fix overly aggressive substitution pattern in abs-rpath to allow things
like "-Wl,-R${exec_prefix}/lib". This fixes any breakage in *-config
scripts where the above example was being stripped out.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/gen-transform.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh index 1ca7d91f019..4542f3b2a32 100644 --- a/mk/buildlink3/gen-transform.sh +++ b/mk/buildlink3/gen-transform.sh @@ -1,6 +1,6 @@ #!@BUILDLINK_SHELL@ # -# $NetBSD: gen-transform.sh,v 1.11 2004/01/13 07:52:37 jlam Exp $ +# $NetBSD: gen-transform.sh,v 1.12 2004/01/17 17:33:49 jlam Exp $ transform="@_BLNK_TRANSFORM_SEDFILE@" untransform="@_BLNK_UNTRANSFORM_SEDFILE@" @@ -59,12 +59,12 @@ EOF gen $action mangle:-R$2:-R$3 ;; abs-rpath) - gen $action __r:-Wl,--rpath-link,[^/] - gen $action __r:-Wl,--rpath,[^/] - gen $action __r:-Wl,-rpath-link,[^/] - gen $action __r:-Wl,-rpath,[^/] - gen $action __r:-Wl,-R[^/] - gen $action __r:-R[^/] + gen $action __r:-Wl,--rpath-link,[^/\$] + gen $action __r:-Wl,--rpath,[^/\$] + gen $action __r:-Wl,-rpath-link,[^/\$] + gen $action __r:-Wl,-rpath,[^/\$] + gen $action __r:-Wl,-R[^/\$] + gen $action __r:-R[^/\$] ;; no-rpath) gen $action _r:-Wl,--rpath-link, |