Wed Dec 26 14:27:23 2018 UTC ()
Add -lrump after -lkernspace, because kernspace.a references symbols
from librump and hooray for static linking semantics.

Fixes sun2 build issue reported by kre@.

(XXX WTF did this only start failing after the addition of t_threadpool?)


(thorpej)
diff -r1.17 -r1.18 src/tests/rump/rumpkern/Makefile
cvs diff -r1.17 -r1.18 src/tests/rump/rumpkern/Makefile (expand / switch to unified diff)

--- src/tests/rump/rumpkern/Makefile 2018/12/24 21:42:05 1.17
+++ src/tests/rump/rumpkern/Makefile 2018/12/26 14:27:23 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2018/12/24 21:42:05 thorpej Exp $ 1# $NetBSD: Makefile,v 1.18 2018/12/26 14:27:23 thorpej Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5TESTSDIR= ${TESTSBASE}/rump/rumpkern 5TESTSDIR= ${TESTSBASE}/rump/rumpkern
6 6
7TESTS_C= t_copy 7TESTS_C= t_copy
8TESTS_C+= t_kern 8TESTS_C+= t_kern
9TESTS_C+= t_lwproc 9TESTS_C+= t_lwproc
10TESTS_C+= t_modcmd 10TESTS_C+= t_modcmd
11TESTS_C+= t_modlinkset 11TESTS_C+= t_modlinkset
12TESTS_C+= t_signals 12TESTS_C+= t_signals
13TESTS_C+= t_threads 13TESTS_C+= t_threads
14TESTS_C+= t_threadpool 14TESTS_C+= t_threadpool
@@ -16,18 +16,18 @@ TESTS_C+= t_tsleep @@ -16,18 +16,18 @@ TESTS_C+= t_tsleep
16TESTS_C+= t_workqueue 16TESTS_C+= t_workqueue
17TESTS_C+= t_vm 17TESTS_C+= t_vm
18 18
19TESTS_SH= t_sp 19TESTS_SH= t_sp
20 20
21SUBDIR+= h_client h_server 21SUBDIR+= h_client h_server
22 22
23ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread 23ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
24LDADD.t_modlinkset+= -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos  24LDADD.t_modlinkset+= -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos
25LDADD.t_modlinkset+= -lrumpfs_cd9660 ${ADD_TO_LD} 25LDADD.t_modlinkset+= -lrumpfs_cd9660 ${ADD_TO_LD}
26LDADD+= ${ADD_TO_LD} 26LDADD+= ${ADD_TO_LD}
27 27
28KERNSPACE != cd ${.CURDIR}/../kernspace && ${PRINTOBJDIR} 28KERNSPACE != cd ${.CURDIR}/../kernspace && ${PRINTOBJDIR}
29LDADD+= -L${KERNSPACE} -lkernspace 29LDADD+= -L${KERNSPACE} -lkernspace -lrump
30 30
31WARNS= 4 31WARNS= 4
32 32
33.include <bsd.test.mk> 33.include <bsd.test.mk>