From 690dc6bb6c16a8b6d49daa28bf918c2187189cd1 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Sat, 6 Jun 2015 11:51:39 +0000 Subject: [PATCH] inet: do not link against libc This should make its printed errors show up again. Change-Id: I6839a584dc2a544bae7973ded3ab1dacf04e4ec0 --- minix/lib/libminc/Makefile | 2 +- minix/lib/libminc/arch/earm/Makefile.libc.inc | 4 +++- minix/net/inet/Makefile | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/minix/lib/libminc/Makefile b/minix/lib/libminc/Makefile index 3432de78b..285d9039c 100644 --- a/minix/lib/libminc/Makefile +++ b/minix/lib/libminc/Makefile @@ -211,7 +211,7 @@ CPPFLAGS.tolower_.c+= -I${LIBCDIR}/locale CPPFLAGS.toupper_.c+= -I${LIBCDIR}/locale .for f in \ - waitpid.o read_tsc_64.o fslib.o itoa.o + waitpid.o read_tsc_64.o fslib.o itoa.o oneC_sum.o ${f} ${f:C/\.o/.bc/}: ${LIBMINIXCDIR}/gen/${f:C/\.o/.c/} OBJS+= ${f} CLEANFILES+= ${f} diff --git a/minix/lib/libminc/arch/earm/Makefile.libc.inc b/minix/lib/libminc/arch/earm/Makefile.libc.inc index 5295a0cc3..85f5d13d4 100644 --- a/minix/lib/libminc/arch/earm/Makefile.libc.inc +++ b/minix/lib/libminc/arch/earm/Makefile.libc.inc @@ -24,7 +24,9 @@ OBJS+= ${f} CLEANFILES+= ${f} .endfor -CPPFLAGS.byte_swap_4.S+= -D_STANDALONE +# 20150607 dcvmoole: commented out as this causes inet to fail linking on a +# missing __bswap32 symbol +#CPPFLAGS.byte_swap_4.S+= -D_STANDALONE .for f in \ __aeabi_idiv0.o __aeabi_ldiv0.o diff --git a/minix/net/inet/Makefile b/minix/net/inet/Makefile index ebc727efc..839b0f980 100644 --- a/minix/net/inet/Makefile +++ b/minix/net/inet/Makefile @@ -19,9 +19,6 @@ NOCLANGERROR=yes DPADD+= ${LIBCHARDRIVER} ${LIBSYS} LDADD+= -lchardriver -lsys -DPADD+= ${LIBC} -LDADD+= -lc - CPPFLAGS+= -I${.CURDIR} -D'ARGS(a)=a' .include