diff --git a/config/rules.mk b/config/rules.mk index 05429b258225..eb453d347379 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -806,7 +806,7 @@ ifdef DTRACE_PROBE_OBJ ifndef DTRACE_LIB_DEPENDENT NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS)) $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS) - dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS) + dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS) endif endif endif @@ -824,7 +824,7 @@ ifndef INCREMENTAL_LINKER endif ifdef DTRACE_LIB_DEPENDENT ifndef XP_MACOSX - dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) + dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) endif $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) @$(RM) $(DTRACE_PROBE_OBJ) diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 0ad2a170d559..84b7e6cdb7a1 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -297,7 +297,7 @@ endif ifdef HAVE_DTRACE $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d - dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in + 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 diff --git a/probes/Makefile.in b/probes/Makefile.in index 6d18f3425459..deec83f654af 100644 --- a/probes/Makefile.in +++ b/probes/Makefile.in @@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h # Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile - dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp + dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \ mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h rm mozilla-trace.h.tmp