diff options
author | drochner <drochner@pkgsrc.org> | 2010-08-30 17:27:11 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2010-08-30 17:27:11 +0000 |
commit | 45ee161c1b28b63428af3612f606099e18a1a0c5 (patch) | |
tree | 3f882d4e505d60ffecf965e187ac748ea762db08 | |
parent | 537693ab931adaf11d9d7e44df854269a6e70ce6 (diff) | |
download | pkgsrc-45ee161c1b28b63428af3612f606099e18a1a0c5.tar.gz |
move BUILDLINK_LDFLAGS definition from bl3.mk to builtin.mk -- in theory,
the linker flag should be filtered out by a rule in builtin.mk, but
apparently this doesn't always work. If in builtin.mk, it doesn't get
defined unnecessarily.
-rw-r--r-- | devel/librfuncs/buildlink3.mk | 3 | ||||
-rw-r--r-- | devel/librfuncs/builtin.mk | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/devel/librfuncs/buildlink3.mk b/devel/librfuncs/buildlink3.mk index 66c03cce859..3913dede324 100644 --- a/devel/librfuncs/buildlink3.mk +++ b/devel/librfuncs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:21 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2010/08/30 17:27:11 drochner Exp $ BUILDLINK_TREE+= librfuncs @@ -7,7 +7,6 @@ LIBRFUNCS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.librfuncs+= librfuncs>=1.0.4 BUILDLINK_PKGSRCDIR.librfuncs?= ../../devel/librfuncs -BUILDLINK_LDFLAGS.librfuncs+= -lrfuncs .endif # LIBRFUNCS_BUILDLINK3_MK BUILDLINK_TREE+= -librfuncs diff --git a/devel/librfuncs/builtin.mk b/devel/librfuncs/builtin.mk index 4438b89b7b1..b17f472d426 100644 --- a/devel/librfuncs/builtin.mk +++ b/devel/librfuncs/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2010/08/09 10:49:28 drochner Exp $ +# $NetBSD: builtin.mk,v 1.2 2010/08/30 17:27:11 drochner Exp $ BUILTIN_PKG:= librfuncs .include "../../mk/buildlink3/bsd.builtin.mk" @@ -40,5 +40,7 @@ CHECK_BUILTIN.librfuncs?= no .if !empty(CHECK_BUILTIN.librfuncs:M[nN][oO]) . if !empty(USE_BUILTIN.librfuncs:M[yY][eE][sS]) BUILDLINK_TRANSFORM+= rm:-lrfuncs +. else +BUILDLINK_LDFLAGS.librfuncs+= -lrfuncs . endif .endif # CHECK_BUILTIN.librfuncs |