Module Name:    src
Committed By:   christos
Date:           Mon Sep 23 13:00:13 UTC 2024

Modified Files:
        src/share/mk: bsd.own.mk

Log Message:
Handle multiple versions of jemalloc


To generate a diff of this commit:
cvs rdiff -u -r1.1404 -r1.1405 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1404 src/share/mk/bsd.own.mk:1.1405
--- src/share/mk/bsd.own.mk:1.1404	Mon Sep 23 06:21:14 2024
+++ src/share/mk/bsd.own.mk	Mon Sep 23 09:00:13 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1404 2024/09/23 10:21:14 rin Exp $
+#	$NetBSD: bsd.own.mk,v 1.1405 2024/09/23 13:00:13 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -255,6 +255,14 @@ HAVE_JEMALLOC?=		100
 HAVE_JEMALLOC?=		510
 .endif
 
+.if ${HAVE_JEMALLOC} == 530
+EXTERNAL_JEMALLOC_SUBDIR = jemalloc
+.elif ${HAVE_JEMALLOC} == 510 || ${HAVE_JEMALLOC} == 100
+EXTERNAL_JEMALLOC_SUBDIR = jemalloc.old
+.else
+EXTERNAL_JEMALLOC_SUBDIR = /does/not/exist
+.endif
+
 .if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
 .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
 PRINTOBJDIR=	${MAKE} -r -V .OBJDIR -f /dev/null xxx

Reply via email to