summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib
diff options
context:
space:
mode:
authorpooka <pooka@NetBSD.org>2014-12-10 16:55:54 +0000
committerpooka <pooka@NetBSD.org>2014-12-10 16:55:54 +0000
commit016c119cfdecc01dfff9ecbd9a13298ca0dde720 (patch)
treea87bed22f04bf6c18148540d451821b7baa407c8 /lib/libc/stdlib
parenta902230d4f54c97ca1c1dc9409953add8787be20 (diff)
Add two more Makefile conditionals required for RUMPRUN=yes
* do not build _errno.c (different thread/tls handling) * do not build either phk- or jemalloc (different backing page allocation) Somehow I missed these in the previous commit, but now libc built with RUMPRUN=yes works also with rumprun-posix, so there's reasonably high confidence that I didn't miss anything anymore.
Diffstat (limited to 'lib/libc/stdlib')
-rw-r--r--lib/libc/stdlib/Makefile.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index 54e078d4974..ad947b679bb 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.82 2014/07/20 13:34:17 christos Exp $
+# $NetBSD: Makefile.inc,v 1.83 2014/12/10 16:55:54 pooka Exp $
# from: @(#)Makefile.inc 8.3 (Berkeley) 2/4/95
# stdlib sources
@@ -24,11 +24,13 @@ SRCS+= div.c ldiv.c imaxdiv.c
# This might be replaced by erand48.c
SRCS+= erand48_ieee754.c
+.if ${RUMPRUN} != "yes"
.if (${USE_JEMALLOC} != "no")
SRCS+= jemalloc.c
.else
SRCS+= malloc.c
.endif
+.endif
CPPFLAGS.strtol.c+= -I${LIBCDIR}/../../common/lib/libc/stdlib
CPPFLAGS.strtoq.c+= -I${LIBCDIR}/../../common/lib/libc/stdlib