backout b7a2f7ff5e87 (bug 1322703) for making local xul.dll link times way slower
authorTed Mielczarek <ted@mielczarek.org>
Wed, 01 Mar 2017 10:37:35 -0500
changeset 374345 831f13e13f320430af31fa37553fadddfa898585
parent 374344 1e1880fc4d8f9f79dafb440b041efaf84d73bed0
child 374346 33c9d4c02376826733a4a35687e1e8be21b58f4d
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1322703
milestone54.0a1
backs outb7a2f7ff5e87ed79ae1d236d593caf4b63a1b5b8
backout b7a2f7ff5e87 (bug 1322703) for making local xul.dll link times way slower MozReview-Commit-ID: 5QVFWVhfFfD
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -148,17 +148,32 @@ EMBED_MANIFEST_AT=2
 
 endif # MKSHLIB
 endif # FORCE_SHARED_LIB
 endif # LIBRARY
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 
+#
+# Unless we're building SIMPLE_PROGRAMS, all C++ files share a PDB file per
+# directory. For parallel builds, this PDB file is shared and locked by
+# MSPDBSRV.EXE, starting with MSVC8 SP1. If you're using MSVC 7.1 or MSVC8
+# without SP1, don't do parallel builds.
+#
+# The final PDB for libraries and programs is created by the linker and uses
+# a different name from the single PDB file created by the compiler. See
+# bug 462740.
+#
+
+ifdef SIMPLE_PROGRAMS
 COMPILE_PDB_FLAG ?= -Fd$(basename $(@F)).pdb
+else
+COMPILE_PDB_FLAG ?= -Fdgenerated.pdb
+endif
 COMPILE_CFLAGS += $(COMPILE_PDB_FLAG)
 COMPILE_CXXFLAGS += $(COMPILE_PDB_FLAG)
 
 LINK_PDBFILE ?= $(basename $(@F)).pdb
 ifdef MOZ_DEBUG
 CODFILE=$(basename $(@F)).cod
 endif