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/jgrasp | |
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/jgrasp')
-rw-r--r-- | devel/jgrasp/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/jgrasp/Makefile b/devel/jgrasp/Makefile index 2b6a75b95d6..ea1772539f1 100644 --- a/devel/jgrasp/Makefile +++ b/devel/jgrasp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/06/05 22:51:25 jschauma Exp $ +# $NetBSD: Makefile,v 1.6 2004/08/27 06:29:07 jlam Exp $ # DISTNAME= jgrasp170 @@ -21,7 +21,7 @@ do-build: ${CC} ${CFLAGS} -lutil -o ${WRKSRC}/jbin/${LOWER_OPSYS}_run \ ${WRKSRC}/src/linux_run.c ${CC} ${CFLAGS} -I${X11BASE}/include \ - -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib -lX11 \ + -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lX11 \ -o ${WRKSRC}/bin/${LOWER_OPSYS}/jgrasp \ ${WRKSRC}/src/linux_exec.c |