diff options
| author | Adam H. Leventhal <ahl@delphix.com> | 2012-05-11 22:38:24 -0400 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2012-05-11 22:38:24 -0400 |
| commit | 0a49f0acd6427f9d299d5b4fe3792feaa7d20e34 (patch) | |
| tree | 7ce8f6aa76688b36a5e23db217e358fc327f0dd8 /usr/src | |
| parent | 3b6e0a598869dfc84461624e8699bf51738f68b3 (diff) | |
| download | illumos-joyent-0a49f0acd6427f9d299d5b4fe3792feaa7d20e34.tar.gz | |
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>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/Makefile.master | 4 | ||||
| -rw-r--r-- | usr/src/cmd/isns/isnsd/Makefile | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 062f9bdd19..90ba85de0d 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -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 @@ WC= /usr/bin/wc 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 --git a/usr/src/cmd/isns/isnsd/Makefile b/usr/src/cmd/isns/isnsd/Makefile index 49eada657b..db3e5c5e90 100644 --- a/usr/src/cmd/isns/isnsd/Makefile +++ b/usr/src/cmd/isns/isnsd/Makefile @@ -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 @@ $(PROG): $(OBJS) $(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: |