From 100babf0e0439262a601b6f0f6070278777cecbe Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Wed, 5 Dec 2012 13:23:36 +0100 Subject: [PATCH] Removing last reference to NETBSDINCLUDES Also removing minix-config.inc and placing its content in Makefile.inc, as the file is modified anyway. Simplifies diff. Change-Id: I6262fdb790a5455b59e07acdccdc221fd5dd41f8 --- lib/libc/Makefile.inc | 9 +++++++-- lib/libc/minix-config.inc | 12 ------------ 2 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 lib/libc/minix-config.inc diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc index e1af10298..11019198c 100644 --- a/lib/libc/Makefile.inc +++ b/lib/libc/Makefile.inc @@ -17,8 +17,13 @@ # The Hesiod functions are always in libc. To choose that getpwent() and friends # actually call the Hesiod functions, put -DHESIOD on the CPPFLAGS line below. .if defined(__MINIX) -.include "minix-config.inc" -.endif +USE_INET6=no +MKYP=no #requires RPC +USE_JEMALLOC=no +USE_MINIXMALLOC=yes +USE_FORT=no +USE_LIBTRE=no +.endif # defined(__MINIX) USE_FORT?= yes diff --git a/lib/libc/minix-config.inc b/lib/libc/minix-config.inc deleted file mode 100644 index 25001f786..000000000 --- a/lib/libc/minix-config.inc +++ /dev/null @@ -1,12 +0,0 @@ -NETBSDINCLUDES= /usr/include/ - -USE_INET6=no - -MKYP=no #requires RPC -USE_JEMALLOC=no -USE_MINIXMALLOC=yes -USE_FORT=no -USE_LIBTRE=no - -NOGCCERROR:= yes -NOCLANGERROR:= yes -- 2.44.0