Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Fix build with bundled libelf
Baptiste Daroussin committed 12 years ago
commit 0518c5056b6de063bef0cb4be49a6a43512c2ec7
parent a29d3e2
1 file changed +4 -3
modified pkg/Makefile
@@ -58,9 +58,6 @@ DEBUG_FLAGS+= -pg
CFLAGS+=	-I../libpkg \
		-I${.CURDIR}/../external/uthash \
		-I${.CURDIR}/../external/expat/lib
-
.if !exists(/usr/lib/libelf.so)
-
LDADD_STATIC+=		-L../external/libelf
-
.endif
LDADD+=		-L../libpkg \
		-L../external/expat \
		-ledit \
@@ -82,6 +79,10 @@ LDADD_STATIC= -L../external/sqlite \
		-L../external/libyaml \
		-L../external/libucl

+
.if !exists(/usr/lib/libelf.so)
+
LDADD_STATIC+=		-L../external/libelf
+
.endif
+

LDADD_STATIC+=	-lsqlite3 \
		-larchive \
		-lsbuf \