diff options
author | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
commit | 64c83961643743b2423afc56e568e2cb05963660 (patch) | |
tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /lang/perl58/Makefile | |
parent | b1d52ddb282f29c948118e6048aa57331cc442c0 (diff) | |
download | pkgsrc-64c83961643743b2423afc56e568e2cb05963660.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 'lang/perl58/Makefile')
-rw-r--r-- | lang/perl58/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile index 4fe5b87c20a..747fa1af01f 100644 --- a/lang/perl58/Makefile +++ b/lang/perl58/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/06/25 17:41:47 abs Exp $ +# $NetBSD: Makefile,v 1.48 2004/08/27 06:29:08 jlam Exp $ # The following two variables should have empty values unless we're # building a perl snapshot or release candidate. @@ -168,9 +168,9 @@ LOCINCPATH= ${LOCALBASE}/include # flags to the link command in the right way. # .if ${OBJECT_FMT} == "a.out" -LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${RPATH_FLAG}/g} +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${LINKER_RPATH_FLAG} /g} .elif ${OBJECT_FMT} == "ELF" -LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/-Wl,${RPATH_FLAG}/g} +LOCLIBRPATHFLAGS= ${LOCLIBPATH:S/^/${COMPILER_RPATH_FLAG}/g} .else LOCLIBRPATHFLAGS= # empty .endif |