Wed Mar 27 11:15:55 2019 UTC ()
undo previous, too much breaks.


(christos)
diff -r1.1115 -r1.1116 src/share/mk/bsd.own.mk
cvs diff -r1.1115 -r1.1116 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2019/03/27 02:51:41 1.1115
+++ src/share/mk/bsd.own.mk 2019/03/27 11:15:55 1.1116
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1115 2019/03/27 02:51:41 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.1116 2019/03/27 11:15:55 christos Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -162,27 +162,34 @@ HAVE_BINUTILS?= 231 @@ -162,27 +162,34 @@ HAVE_BINUTILS?= 231
162 162
163.if ${HAVE_BINUTILS} == 231 163.if ${HAVE_BINUTILS} == 231
164EXTERNAL_BINUTILS_SUBDIR= binutils 164EXTERNAL_BINUTILS_SUBDIR= binutils
165.elif ${HAVE_BINUTILS} == 227 165.elif ${HAVE_BINUTILS} == 227
166EXTERNAL_BINUTILS_SUBDIR= binutils.old 166EXTERNAL_BINUTILS_SUBDIR= binutils.old
167.else 167.else
168EXTERNAL_BINUTILS_SUBDIR= /does/not/exist 168EXTERNAL_BINUTILS_SUBDIR= /does/not/exist
169.endif 169.endif
170 170
171# 171#
172# What version of jemalloc we use (100 is the one 172# What version of jemalloc we use (100 is the one
173# built-in to libc from 2005 (pre version 3). 173# built-in to libc from 2005 (pre version 3).
174# 174#
 175.if ${MACHINE_CPU} == "x86_64" || \
 176 ${MACHINE_CPU} == "i386" || \
 177 ${MACHINE_CPU} == "aarch64" || \
 178 ${MACHINE} == "sparc64"
175HAVE_JEMALLOC?= 510 179HAVE_JEMALLOC?= 510
 180.else
 181HAVE_JEMALLOC?= 100
 182.endif
176 183
177.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*) 184.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
178.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR) 185.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
179PRINTOBJDIR= ${MAKE} -r -V .OBJDIR -f /dev/null xxx 186PRINTOBJDIR= ${MAKE} -r -V .OBJDIR -f /dev/null xxx
180.else 187.else
181PRINTOBJDIR= ${MAKE} -V .OBJDIR 188PRINTOBJDIR= ${MAKE} -V .OBJDIR
182.endif 189.endif
183.else 190.else
184PRINTOBJDIR= echo /error/bsd.own.mk/PRINTOBJDIR # avoid infinite recursion 191PRINTOBJDIR= echo /error/bsd.own.mk/PRINTOBJDIR # avoid infinite recursion
185.endif 192.endif
186 193
187# 194#
188# Determine if running in the NetBSD source tree by checking for the 195# Determine if running in the NetBSD source tree by checking for the