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 /www/mozilla | |
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 'www/mozilla')
-rw-r--r-- | www/mozilla/Makefile.common | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 3dab04a93b6..cb8814185c7 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.42 2004/06/19 00:25:04 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.43 2004/08/27 06:29:11 jlam Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-source-${MOZ_DIST_VER} @@ -64,7 +64,7 @@ MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA} MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA} MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} -LDFLAGS+= -Wl,${RPATH_FLAG}${MOZ_LIBDIR} +LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR} .ifdef BUILD_SVG MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 |