Bug 1353558 - Restore "dtrace -G" support after bug 1353259 for Solaris and FreeBSD. r=glandium
authorJan Beich <jbeich@FreeBSD.org>
Wed, 05 Apr 2017 21:51:26 +0000
changeset 353720 2d6ef8ca4a742d2ba61f01250af60c9cfbc9f11b
parent 353719 cff015caf58e1dff2d36b9682c55073ddb56f32b
child 353721 2458112439037abae9e72fc0612b75fe7a82344d
push id31675
push usercbook@mozilla.com
push dateWed, 19 Apr 2017 08:28:05 +0000
treeherdermozilla-central@245811243903 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1353558, 1353259
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1353558 - Restore "dtrace -G" support after bug 1353259 for Solaris and FreeBSD. r=glandium MozReview-Commit-ID: JKg5sCbfuzm
js/src/Makefile.in
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -143,17 +143,26 @@ javascript-trace.h: $(srcdir)/devtools/j
 	dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
 	    -e '/const/!s/char \*/const char */g' \
 	    javascript-trace.h.in > javascript-trace.h
 
 # We can't automatically generate dependencies on auto-generated headers;
 # we have to list them explicitly.
 $(addsuffix .$(OBJ_SUFFIX),Probes jsinterp jsobj): $(CURDIR)/javascript-trace.h
-endif
+
+ifneq ($(OS_ARCH),Darwin)
+DTRACE_PROBE_OBJ = js-dtrace.$(OBJ_SUFFIX)
+$(LIBRARY): $(DTRACE_PROBE_OBJ)
+$(DTRACE_PROBE_OBJ): $(srcdir)/devtools/javascript-trace.d $(OBJS)
+	dtrace -x nolibs -G -C -s $< -o $@ $(filter-out $<, $^)
+
+OBJS += $(DTRACE_PROBE_OBJ) # for "make clean"
+endif # OS_ARCH != Darwin
+endif # HAVE_DTRACE
 
 ###############################################
 # Generating source package tarballs
 # (only possible when tar is found)
 ifneq (,$(TAR))
 
 source-package:
 	SRCDIR=$(srcdir) \