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 | 2347df5518184e316028bf90a0d032ee71028b63 (patch) | |
tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /databases/db/buildlink3.mk | |
parent | e5a1b353192b781a2b5c36eca0f963c97d681caa (diff) | |
download | pkgsrc-2347df5518184e316028bf90a0d032ee71028b63.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 'databases/db/buildlink3.mk')
-rw-r--r-- | databases/db/buildlink3.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk index a3120c167de..388d9e045ad 100644 --- a/databases/db/buildlink3.mk +++ b/databases/db/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2004/07/10 03:01:38 grant Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2004/08/27 06:29:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB_BUILDLINK3_MK:= ${DB_BUILDLINK3_MK}+ @@ -21,7 +21,7 @@ BUILDLINK_LIBDIRS.db2?= lib BUILDLINK_TRANSFORM+= l:db:db2 BUILDLINK_CPPFLAGS.db2= -I${BUILDLINK_PREFIX.db2}/${BUILDLINK_INCDIRS.db2} . endif -BUILDLINK_LDFLAGS.db2= -L${BUILDLINK_PREFIX.db2}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib +BUILDLINK_LDFLAGS.db2= -L${BUILDLINK_PREFIX.db2}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib BUILDLINK_LIBS.db2= -ldb2 .endif # DB_BUILDLINK3_MK |