Bug 1414064 - Remove SHLIB_LD{START,END}FILE and SUB_SHLOBJS. draft
authorChris Manchester <cmanchester@mozilla.com>
Tue, 07 Nov 2017 14:34:44 -0800
changeset 694580 cd39dfbd30b97eef42f51ccec25705a696c556f7
parent 694579 a44e4f7f9604ebd14e06119cef293083c8c11194
child 694581 4a2e809955f4fd62f089d27653e928deee5362e4
push id88162
push userbmo:cmanchester@mozilla.com
push dateTue, 07 Nov 2017 22:35:13 +0000
bugs1414064
milestone58.0a1
Bug 1414064 - Remove SHLIB_LD{START,END}FILE and SUB_SHLOBJS. These are only set by nss' make build system, which we no longer use. MozReview-Commit-ID: 9XRhpDmlekK
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -703,17 +703,17 @@ endif
 # symlinks back to the originals. The symlinks are a no-op for stabs debugging,
 # so no need to conditionalize on OS version or debugging format.
 
 $(SHARED_LIBRARY): $(OBJS) $(RESFILE) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(STATIC_LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
 	$(REPORT_BUILD)
 ifndef INCREMENTAL_LINKER
 	$(RM) $@
 endif
-	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE)
+	$(EXPAND_MKSHLIB) $(OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS)
 	$(call CHECK_BINARY,$@)
 
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 ifdef MSMANIFEST_TOOL
 ifdef EMBED_MANIFEST_AT
 	@if test -f $@.manifest; then \
 		if test -f '$(srcdir)/$@.manifest'; then \
 			echo 'Embedding manifest from $(srcdir)/$@.manifest and $@.manifest'; \