diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
| commit | ca7093842870728d22dde1258798b1704c53ca18 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /mk/bsd.prefs.mk | |
| parent | 49f0d0312d389247bf08d1e7c28970e1dfb7508f (diff) | |
| download | pkgsrc-ca7093842870728d22dde1258798b1704c53ca18.tar.gz | |
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 2adc58540cb..bad614c97d3 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.164 2004/07/30 20:59:08 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.165 2004/08/27 06:29:09 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -356,10 +356,23 @@ XMKMF_CMD?= ${X11PREFIX}/bin/xmkmf DEPOT_SUBDIR?= packages DEPOTBASE= ${LOCALBASE}/${DEPOT_SUBDIR} -# RPATH_FLAG publicly exports the linker flag used to specify run-time -# library search paths. +# LINK_RPATH_FLAG publicly exports the linker flag used to set the +# run-time library search path. # -RPATH_FLAG?= ${_OPSYS_RPATH_NAME} +.if defined(_OPSYS_LINKER_RPATH_FLAG) +LINKER_RPATH_FLAG= ${_OPSYS_LINKER_RPATH_FLAG} +.else +LINKER_RPATH_FLAG?= ${_LINKER_RPATH_FLAG} +.endif + +# COMPILER_RPATH_FLAG publicly exports the compiler flag used to pass +# run-time library search path directives to the linker. +# +.if defined(_OPSYS_COMPILER_RPATH_FLAG) +COMPILER_RPATH_FLAG= ${_OPSYS_COMPILER_RPATH_FLAG} +.else +COMPILER_RPATH_FLAG?= ${_COMPILER_RPATH_FLAG} +.endif # WHOLE_ARCHIVE_FLAG and NO_WHOLE_ARCHIVE_FLAG publically export the # linker flags to extract all symbols from a static archive. |