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 /devel/gnustep-make | |
| 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 'devel/gnustep-make')
| -rw-r--r-- | devel/gnustep-make/gnustep.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk index 201bbf6c41d..470075b910d 100644 --- a/devel/gnustep-make/gnustep.mk +++ b/devel/gnustep-make/gnustep.mk @@ -1,4 +1,4 @@ -# $NetBSD: gnustep.mk,v 1.1 2004/04/10 23:31:39 rh Exp $ +# $NetBSD: gnustep.mk,v 1.2 2004/08/27 06:29:07 jlam Exp $ .if !defined(GNUSTEP_MK) GNUSTEP_MK= #defined @@ -30,8 +30,8 @@ GNUSTEP_LDIRS= ${GNUSTEP_LFLAGS:S/-L//g} GNUSTEP_IDIRS= ${GNUSTEP_IFLAGS:S/-I//g} GNUSTEP_BLDIRS= ${GNUSTEP_LDIRS:S/${PREFIX}\///g} GNUSTEP_BIDIRS= ${GNUSTEP_IDIRS:S/${PREFIX}\///g} -.if empty(_USE_RPATH:M[nN][oO]) -GNUSTEP_RFLAGS= ${GNUSTEP_LFLAGS:S/-L/-Wl,${_OPSYS_RPATH_NAME}/g} +.if !empty(_USE_RPATH:M[yY][eE][sS]) +GNUSTEP_RFLAGS= ${GNUSTEP_LFLAGS:S/-L/${COMPILER_RPATH_FLAG}/g} .else GNUSTEP_RFLAGS?= .endif |