From c67635060cd54b4f914d016d2d93bdcc9c66c834 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. --- cad/fasthenry/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cad') diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile index 5d8c6dbc8ed..8e0f22db20f 100644 --- a/cad/fasthenry/Makefile +++ b/cad/fasthenry/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/04/11 05:02:25 snj Exp $ +# $NetBSD: Makefile,v 1.22 2004/08/27 06:29:06 jlam Exp $ # DISTNAME= fasthenry-3.0-12Nov96 @@ -32,7 +32,7 @@ CONFIGURE_ARGS= default #> . include "../../math/libffm/buildlink3.mk" DEPENDS+= libffm-[0-9]*:../../math/libffm -LIBS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -lffm -lm +LIBS= -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lffm -lm MAKE_ENV+= LIBS="${LIBS}" .else LIBS= -lm -- cgit v1.2.3