# HG changeset patch
# User Adam H. Leventhal <ahl@delphix.com>
# Date 1336790304 14400
# Node ID 125d1b3a6fa8f652f72b7a557ba72c18342c69f4
# Parent  32dde99890907b9e75d7a371556bfce399a2e5f4
2710 DTrace can cause build failures if the kernel's CTF data is corrupt
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Bryan Cantrill <bryancantrill@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

diff -r 32dde9989090 -r 125d1b3a6fa8 usr/src/Makefile.master
--- a/usr/src/Makefile.master	Fri May 11 22:38:13 2012 -0400
+++ b/usr/src/Makefile.master	Fri May 11 22:38:24 2012 -0400
@@ -21,7 +21,9 @@
 
 #
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012 by Delphix. All rights reserved.
 #
+
 #
 # Makefile.master, global definitions for system source
 #
@@ -185,7 +187,7 @@
 XARGS=		/usr/bin/xargs
 ELFEDIT=	/usr/bin/elfedit
 ELFSIGN=	/usr/bin/elfsign
-DTRACE=		/usr/sbin/dtrace
+DTRACE=		/usr/sbin/dtrace -xnolibs
 UNIQ=		/usr/bin/uniq
 TAR=		/usr/bin/tar
 
diff -r 32dde9989090 -r 125d1b3a6fa8 usr/src/cmd/isns/isnsd/Makefile
--- a/usr/src/cmd/isns/isnsd/Makefile	Fri May 11 22:38:13 2012 -0400
+++ b/usr/src/cmd/isns/isnsd/Makefile	Fri May 11 22:38:24 2012 -0400
@@ -23,6 +23,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2012 by Delphix. All rights reserved.
+#
+
 PROG = isns
 
 DSRC = isns_provider.d
@@ -68,14 +72,14 @@
 	$(POST_PROCESS)
 
 %.h: %.d
-	$(DTRACE) -xnolibs -h -s $< -o $@
+	$(DTRACE) -h -s $< -o $@
 
 %.o:	%.c $(DTRACE_HEADER)
 	$(COMPILE.c) $<
 	$(POST_PROCESS_O)
 
 %.o:	%.d $(COBJS)
-	$(COMPILE.d) -xnolibs -s $< $(COBJS)
+	$(COMPILE.d) -s $< $(COBJS)
 	$(POST_PROCESS_O)
 
 clean: