Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests Fix sun2 build. Still there are some duplicate symbols...



details:   https://anonhg.NetBSD.org/src/rev/074940e01493
branches:  trunk
changeset: 932921:074940e01493
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 17 18:52:43 2020 +0000

description:
Fix sun2 build. Still there are some duplicate symbols in the rump libraries
that make this awkward.

diffstat:

 tests/Makefile.inc |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (20 lines):

diff -r f9e20f0e7903 -r 074940e01493 tests/Makefile.inc
--- a/tests/Makefile.inc        Sun May 17 18:25:11 2020 +0000
+++ b/tests/Makefile.inc        Sun May 17 18:52:43 2020 +0000
@@ -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_PRE = -lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet
+.endif
 LIBRUMPFIFO = -lrumpvfs_nofifofs 
-.endif
-LIBRUMPBASE = -lrumpvfs -lrump -lrumpvfs ${LIBRUMPFIFO} -lrumpuser -lrump -lpthread
+LIBRUMPBASE = ${LIBRUMPFIFO_PRE} -lrumpvfs -lrump -lrumpvfs -lrumpvfs_nofifofs -lrumpuser -lrump -lpthread
 



Home | Main Index | Thread Index | Old Index