Bug 1411712 - Fixup DEFFILE to be added to EXTRA_DEPS on windows when GNU_CC is set. r=mshal
authorChris Manchester <cmanchester@mozilla.com>
Thu, 02 Nov 2017 23:03:01 +0100
changeset 389931 399dbcf3b66e3c4c71127635b5fe6c46dc340018
parent 389930 06a8c0a3322509da4cc9e7bb780ac204e061cfe7
child 389932 6f3b7e0969c97c5c085b52272cccfc9bc3e9c37d
push id32802
push usernbeleuzu@mozilla.com
push dateFri, 03 Nov 2017 09:59:33 +0000
treeherdermozilla-central@e6d86b7284ba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1411712
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1411712 - Fixup DEFFILE to be added to EXTRA_DEPS on windows when GNU_CC is set. r=mshal
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -163,19 +163,19 @@ endif
 COMPILE_CFLAGS += $(COMPILE_PDB_FLAG)
 COMPILE_CXXFLAGS += $(COMPILE_PDB_FLAG)
 
 LINK_PDBFILE ?= $(basename $(@F)).pdb
 ifdef MOZ_DEBUG
 CODFILE=$(basename $(@F)).cod
 endif
 
-EXTRA_DEPS += $(DEFFILE)
+endif # !GNU_CC
 
-endif # !GNU_CC
+EXTRA_DEPS += $(DEFFILE)
 
 endif # WINNT
 
 ifeq (arm-Darwin,$(CPU_ARCH)-$(OS_TARGET))
 ifdef PROGRAM
 MOZ_PROGRAM_LDFLAGS += -Wl,-rpath -Wl,@executable_path/Frameworks
 endif
 endif