Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/Makefile,v rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.166.2.1 retrieving revision 1.167 diff -u -p -r1.166.2.1 -r1.167 --- src/lib/libc/Makefile 2015/06/16 06:08:47 1.166.2.1 +++ src/lib/libc/Makefile 2014/12/10 00:37:30 1.167 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.166.2.1 2015/06/16 06:08:47 snj Exp $ +# $NetBSD: Makefile,v 1.167 2014/12/10 00:37:30 pooka Exp $ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # # All library objects contain sccsid strings by default; they may be @@ -41,6 +41,7 @@ assym.h: ${ARCHDIR}/genassym.cf mv -f assym.h.tmp assym.h .endif +.if ${RUMPRUN} != "yes" # The following controls how to build compatibility code for old NetBSD # binaries. If BUILD_LEGACY is yes, then we build a separate library; otherwise # we include the code in libc. @@ -54,6 +55,7 @@ COMPATDIR=${.CURDIR}/compat # Marker for compat code that can't be easily isolated CPPFLAGS+= -D__BUILD_LEGACY .endif +.endif .include "${.CURDIR}/../../common/lib/libc/Makefile.inc" .include "${.CURDIR}/atomic/Makefile.inc" @@ -90,7 +92,9 @@ CPPFLAGS+= -D__BUILD_LEGACY .include "${.CURDIR}/termios/Makefile.inc" .include "${.CURDIR}/thread-stub/Makefile.inc" .include "${.CURDIR}/time/Makefile.inc" +.if ${RUMPRUN} != "yes" .include "${.CURDIR}/tls/Makefile.inc" +.endif .include "${.CURDIR}/sys/Makefile.inc" .if ${HAVE_LIBGCC_EH} == "no" .include "${NETBSDSRCDIR}/sys/lib/libunwind/Makefile.inc" @@ -128,7 +132,7 @@ REGEX_SPECIALS=[][)(^$$.?*\\;] MKREPRO_SED= -e 's;${NETBSDSRCDIR:C/${REGEX_SPECIALS}/\\\\&/g};/usr/src;' .endif -.if !defined(MLIBDIR) +.if ${RUMPRUN} != "yes" realall: tags tags: ${SRCS} ${_MKTARGET_CREATE} @@ -148,6 +152,7 @@ FILESNAME= libc.tags FILESDIR= /var/db .endif + # workaround for I18N stuffs: build singlebyte setlocale() for libc.a, # multibyte for libc.so. the quirk should be removed when we support # dlopen() from within statically linked binaries.