Module Name: src
Committed By: christos
Date: Sun Mar 9 19:10:01 UTC 2014
Modified Files:
src/share/mk: sys.mk
Log Message:
XXX: use only thread for ctfmerge
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/share/mk/sys.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/sys.mk
diff -u src/share/mk/sys.mk:1.121 src/share/mk/sys.mk:1.122
--- src/share/mk/sys.mk:1.121 Sun Mar 9 14:01:06 2014
+++ src/share/mk/sys.mk Sun Mar 9 15:10:01 2014
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.121 2014/03/09 18:01:06 christos Exp $
+# $NetBSD: sys.mk,v 1.122 2014/03/09 19:10:01 christos Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -44,10 +44,8 @@ LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${L
# C Type Format data is required for DTrace
CTFFLAGS ?= -g -L VERSION
-CTFMFLAGS ?= -g -t -L VERSION
-# XXX: Avoid deadlock in threads
-CTFMERGE_MAX_SLOTS=1
-.export CFTMERGE_MAX_SLOTS
+# Use only one thread for now.
+CTFMFLAGS ?= -S 1 -g -t -L VERSION
# We have to define these here, because if we don't the rules below will
# not work