From 2347df5518184e316028bf90a0d032ee71028b63 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 27 Aug 2004 06:29:06 +0000 Subject: 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} ", 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. --- cross/bfd-mdsetimage/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cross') diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile index 9a1e9dd1481..8ca87e38cc3 100644 --- a/cross/bfd-mdsetimage/Makefile +++ b/cross/bfd-mdsetimage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/20 12:10:55 agc Exp $ +# $NetBSD: Makefile,v 1.14 2004/08/27 06:29:07 jlam Exp $ DISTNAME= bfd-mdsetimage-1.15.1 CATEGORIES= cross @@ -22,7 +22,7 @@ MAKE_ENV+= BFD_VERSION=${BFD_VERSION} \ LIBS="${BFD_LIBS}" FIX_RPATH+= BFD_LIBS -BFD_LIBS= -L${PREFIX}/lib -Wl,${RPATH_FLAG}${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty +BFD_LIBS= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty do-extract: @${MKDIR} ${WRKSRC} -- cgit v1.2.3