From f4f1b7ba10e8ad8a1ccf7dcf39c2cbbfcb8e38ae Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 4 Apr 2017 13:28:11 +0900 Subject: [PATCH] Bug 1353259 - Remove rules.mk sections depending on DTRACE_LIB_DEPENDENT. r=mshal Nothing sets DTRACE_LIB_DEPENDENT. --HG-- extra : rebase_source : adc650b19f1fa3af519d47482998033ccabb83a3 --- config/rules.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index 5a11f9d0c1d6..620f249f4351 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -780,14 +780,12 @@ $(HOST_LIBRARY): $(HOST_OBJS) Makefile ifdef HAVE_DTRACE ifndef XP_MACOSX ifdef DTRACE_PROBE_OBJ -ifndef DTRACE_LIB_DEPENDENT NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS)) $(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 -endif # On Darwin (Mac OS X), dwarf2 debugging uses debug info left in .o files, # so instead of deleting .o files after repacking them into a dylib, we make @@ -799,15 +797,7 @@ $(SHARED_LIBRARY): $(OBJS) $(RESFILE) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(STATIC ifndef INCREMENTAL_LINKER $(RM) $@ endif -ifdef DTRACE_LIB_DEPENDENT -ifndef XP_MACOSX - 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) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) - @$(RM) $(DTRACE_PROBE_OBJ) -else # ! DTRACE_LIB_DEPENDENT $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) -endif # DTRACE_LIB_DEPENDENT $(call CHECK_BINARY,$@) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))