diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-10 15:13:25 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-10 15:13:25 +0000 |
| commit | dda95b67216e9fa40f496e8c74f6d38158cfc472 (patch) | |
| tree | 5ab8ce81b3432f55b2aa753ccbd9ee87833a86d6 /mk/buildlink3 | |
| parent | 1b3922b1bcaa9006b4eefab1b405711412a97afb (diff) | |
| download | pkgsrc-dda95b67216e9fa40f496e8c74f6d38158cfc472.tar.gz | |
In the rpath transformations, also handle -Wl,@_OPSYS_RPATH_NAME@... in
case ${_OPSYS_RPATH_NAME} is something surprising, like "-L".
Diffstat (limited to 'mk/buildlink3')
| -rw-r--r-- | mk/buildlink3/gen-transform.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh index b3ad35ee80d..d0734b4ae7c 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.27 2004/06/04 19:21:23 tv Exp $ +# $NetBSD: gen-transform.sh,v 1.28 2004/08/10 15:13:25 jlam Exp $ transform="@_BLNK_TRANSFORM_SEDFILE@" untransform="@_BLNK_UNTRANSFORM_SEDFILE@" @@ -93,6 +93,7 @@ EOF gen $action mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3 gen $action mangle:-Wl,-rpath,$2:-Wl,-rpath,$3 gen $action mangle:-Wl,-R$2:-Wl,-R$3 + gen $action mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3 gen $action mangle:-R$2:-R$3 ;; sub-rpath) @@ -101,6 +102,7 @@ EOF gen $action sub-mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3 gen $action sub-mangle:-Wl,-rpath,$2:-Wl,-rpath,$3 gen $action sub-mangle:-Wl,-R$2:-Wl,-R$3 + gen $action sub-mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3 gen $action sub-mangle:-R$2:-R$3 ;; abs-rpath) @@ -109,6 +111,7 @@ EOF gen $action __r:-Wl,-rpath-link,\\. gen $action __r:-Wl,-rpath,\\. gen $action __r:-Wl,-R\\. + gen $action __r:-Wl,@_OPSYS_RPATH_NAME@\\. gen $action __r:-R\\. ;; no-rpath) @@ -117,6 +120,7 @@ EOF gen $action __r:-Wl,-rpath-link, gen $action __r:-Wl,-rpath, gen $action __r:-Wl,-R + gen $action __r:-Wl,@_OPSYS_RPATH_NAME@ gen $action __r:-R ;; reorder) @@ -270,6 +274,7 @@ EOF gen $action $r:-Wl,-rpath-link,$2 gen $action $r:-Wl,-rpath,$2 gen $action $r:-Wl,-R$2 + gen $action $r:-Wl,@_OPSYS_RPATH_NAME@$2 gen $action $r:-R$2 ;; S) |