35 lines
1.6 KiB
Text
35 lines
1.6 KiB
Text
diff --git js/src/config/rules.mk js/src/config/rules.mk
|
|
index 4d67eda..783942f 100644
|
|
--- config/rules.mk
|
|
+++ config/rules.mk
|
|
@@ -869,7 +869,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
|
|
@@ -886,7 +886,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) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
|
|
@$(RM) $(DTRACE_PROBE_OBJ)
|
|
diff --git js/src/Makefile.in js/src/Makefile.in
|
|
index 28ca5e8..96793d7 100644
|
|
--- Makefile.in
|
|
+++ Makefile.in
|
|
@@ -906,7 +906,7 @@ endif
|
|
|
|
ifdef HAVE_DTRACE
|
|
$(CURDIR)/javascript-trace.h: $(srcdir)/javascript-trace.d
|
|
- dtrace -h -s $(srcdir)/javascript-trace.d -o javascript-trace.h.in
|
|
+ dtrace -x nolibs -h -s $(srcdir)/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
|