Bug 1444171: Perform an actual clobber for profiledbuild with clang-cl; r=gps
authorNathan Froyd <froydnj@gmail.com>
Mon, 09 Jul 2018 18:26:09 -0400
changeset 480666 7aacbb4551bec8c86a5d532d660d99583608f863
parent 480665 465d19904f09327988de1dc8a7af311548f92e47
child 480667 e96225163a763f78c0b7857bfdbb3b999e3ef97b
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1444171
milestone63.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 1444171: Perform an actual clobber for profiledbuild with clang-cl; r=gps clang-cl-style PGO is more akin to what we have for GCC rather than MSVC, so we should do a full clobber for maybe_clobber_profiledbuild.
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -304,19 +304,23 @@ package-generated-sources:
 ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_)
 # No point in clobbering if PGO has been explicitly disabled.
 ifndef NO_PROFILE_GUIDED_OPTIMIZE
 maybe_clobber_profiledbuild: clean
 else
 maybe_clobber_profiledbuild:
 endif
 else
+ifdef CLANG_CL
+maybe_clobber_profiledbuild: clean
+else
 maybe_clobber_profiledbuild:
 	$(RM) $(DIST)/bin/*.pgc
 	find $(DIST)/$(MOZ_APP_NAME) -name '*.pgc' -exec mv {} $(DIST)/bin \;
+endif # CLANG_CL
 endif
 
 .PHONY: maybe_clobber_profiledbuild
 
 # Look for R_386_PC32 relocations in shared libs, these
 # break x86_64 builds and SELinux users.
 ifeq ($(OS_TARGET)_$(TARGET_XPCOM_ABI),Linux_x86-gcc3)
 check::