Module Name: src
Committed By: christos
Date: Sun May 17 18:52:43 UTC 2020
Modified Files:
src/tests: Makefile.inc
Log Message:
Fix sun2 build. Still there are some duplicate symbols in the rump libraries
that make this awkward.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/Makefile.inc
diff -u src/tests/Makefile.inc:1.8 src/tests/Makefile.inc:1.9
--- src/tests/Makefile.inc:1.8 Sun May 17 14:25:11 2020
+++ src/tests/Makefile.inc Sun May 17 14:52:43 2020
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.8 2020/05/17 18:25:11 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2020/05/17 18:52:43 christos Exp $
WARNS ?= 4
CWARNFLAGS+= -Wno-missing-noreturn
TOOLSSRCDIR:= ${.PARSEDIR}
CPPFLAGS+= -I${TOOLSSRCDIR}
.if ${RUMPFIFO:Uno} == "yes"
-LIBRUMPFIFO = -lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet
-.else
-LIBRUMPFIFO = -lrumpvfs_nofifofs
+LIBRUMPFIFO_PRE = -lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet
.endif
-LIBRUMPBASE = -lrumpvfs -lrump -lrumpvfs ${LIBRUMPFIFO} -lrumpuser -lrump -lpthread
+LIBRUMPFIFO = -lrumpvfs_nofifofs
+LIBRUMPBASE = ${LIBRUMPFIFO_PRE} -lrumpvfs -lrump -lrumpvfs -lrumpvfs_nofifofs -lrumpuser -lrump -lpthread
