From 3cf1fc087873d8ec5051ef9b0906594c96c6bc4a Mon Sep 17 00:00:00 2001
From: justin <justin@NetBSD.org>
Date: Thu, 30 Oct 2014 21:15:13 +0000
Subject: [PATCH] Add libraries in order that they will link if static as well
 as dynamic

---
 external/cddl/osnet/usr.bin/ztest/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/external/cddl/osnet/usr.bin/ztest/Makefile b/external/cddl/osnet/usr.bin/ztest/Makefile
index 584d6c23a48d..f1eeadf166c0 100644
--- a/external/cddl/osnet/usr.bin/ztest/Makefile
+++ b/external/cddl/osnet/usr.bin/ztest/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2009/09/16 09:17:29 haad Exp $
+#	$NetBSD: Makefile,v 1.3 2014/10/30 21:15:13 justin Exp $
 
 .include "../../Makefile.zfs"
 
@@ -8,9 +8,6 @@ MKMAN=	no
 DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} ${LIBPTHREAD} \
 	${LIBZ} ${LIBAVL}
 
-LIBAVL_OBJDIR!=  cd ${LIBAVL_SRCDIR} && ${PRINTOBJDIR}
-LDADD+=         -L${LIBAVL_OBJDIR} -lavl
-
 LIBNVPAIR_OBJDIR!=  cd ${LIBNVPAIR_SRCDIR} && ${PRINTOBJDIR}
 LDADD+=         -L${LIBNVPAIR_OBJDIR} -lnvpair
 
@@ -20,6 +17,9 @@ LDADD+=         -L${LIBUMEM_OBJDIR} -lumem
 LIBZPOOL_OBJDIR!=  cd ${LIBZPOOL_SRCDIR} && ${PRINTOBJDIR}
 LDADD+=         -L${LIBZPOOL_OBJDIR} -lzpool
 
+LIBAVL_OBJDIR!=  cd ${LIBAVL_SRCDIR} && ${PRINTOBJDIR}
+LDADD+=         -L${LIBAVL_OBJDIR} -lavl
+
 LDADD+=	-lm  -lpthread -lz
 
 .PATH: 	 ${ZFSDIR}/dist/cmd/ztest