diff options
| author | jlam <jlam> | 2004-08-10 15:16:29 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-10 15:16:29 +0000 |
| commit | 2bfd6d29a328a415630d07000884d91cebeb4349 (patch) | |
| tree | 2fa08d1792254a4792d569b8377908ef3f46424a /mk/buildlink3 | |
| parent | 18897d69694b390b9009d5cf48ae78aa4a8f5283 (diff) | |
| download | pkgsrc-2bfd6d29a328a415630d07000884d91cebeb4349.tar.gz | |
Reorder the transformations in _BLNK_TRANSFORM so that commands to
remove rpath options come first. This fixes problems we may encounter
if ${_OPSYS_RPATH_NAME} is something surprising, like "-L". On Darwin,
this was causing -L/usr/lib to be stripped out of "-Wl,-L/usr/lib",
which left a bare "-Wl," on the command line.
Diffstat (limited to 'mk/buildlink3')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 27156e6176c..0a77965d2a2 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.146 2004/07/29 05:09:29 xtraeme Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.147 2004/08/10 15:16:29 jlam Exp $ # # An example package buildlink3.mk file: # @@ -867,6 +867,19 @@ BUILDLINK_VARS+= _BLNK_PHYSICAL_PATH.${_var_} . endif .endfor +# Remove -Wl,-R* and *-rpath* if _USE_RPATH == "no". +# Transform -Wl,-R* and *-rpath* if Sun compilers are used. +# +.if defined(_USE_RPATH) && !empty(_USE_RPATH:M[nN][oO]) +_BLNK_TRANSFORM+= no-rpath +.endif +# +# Remove rpath options that try to add relative paths to the runtime +# library search path. This basically partly cleans up after lazy +# programmers. +# +_BLNK_TRANSFORM+= abs-rpath +# # Transform all references to the physical paths to some important # directories into their given names. # @@ -966,19 +979,6 @@ _BLNK_TRANSFORM+= ${BUILDLINK_TRANSFORM} # _BLNK_TRANSFORM+= r:/ # -# Remove -Wl,-R* and *-rpath* if _USE_RPATH == "no". -# Transform -Wl,-R* and *-rpath* if Sun compilers are used. -# -.if defined(_USE_RPATH) && !empty(_USE_RPATH:M[nN][oO]) -_BLNK_TRANSFORM+= no-rpath -.endif -# -# Remove rpath options that try to add relative paths to the runtime -# library search path. This basically partly cleans up after lazy -# programmers. -# -_BLNK_TRANSFORM+= abs-rpath -# # Undo the protection for the directories that we allow to be specified # for the runtime library search path. # |