Bug 1094566 - Do not overwrite buildid on the compilation phase of PGO builds. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 07 Nov 2014 10:16:42 +0900
changeset 217551 f22581e2c9e539ce9e9b8e467c848bb63a887f0a
parent 217550 5f1b17ceebe48984dc35c0de46f8c325931479ab
child 217552 14214fcdb674da1abf2b81bbd9293c45f2ce3cb5
push id52313
push usermh@glandium.org
push dateWed, 26 Nov 2014 07:04:44 +0000
treeherdermozilla-inbound@14214fcdb674 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1094566
milestone36.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 1094566 - Do not overwrite buildid on the compilation phase of PGO builds. r=mshal
config/Makefile.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -43,25 +43,27 @@ HEADERS_TARGET := export
 INSTALL_TARGETS += HEADERS
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 HOST_CFLAGS += -DUNICODE -D_UNICODE
 
 ifndef JS_STANDALONE
+ifndef MOZ_PROFILE_USE
 # Generate a new buildid every time we "export" in config... that's only
 # supposed to be once per-build!
 export::
 ifdef MOZ_BUILD_DATE
 	printf '%s' $(MOZ_BUILD_DATE) > buildid
 else
 	$(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid > buildid
 endif
 endif
+endif
 
 ifdef WRAP_SYSTEM_INCLUDES
 export-preqs = \
   $(call mkdir_deps,system_wrappers) \
   $(NULL)
 
 export:: $(export-preqs)
 	$(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \
@@ -101,17 +103,17 @@ STL_WRAPPERS_SENTINEL = $(DIST)/stl_wrap
 
 export:: $(STL_WRAPPERS_SENTINEL)
 
 GARBAGE += $(STL_WRAPPERS_SENTINEL)
 GARBAGE_DIRS += stl_wrappers
 endif
 
 GARBAGE += \
-  $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) buildid $(srcdir)/*.pyc *.pyc
+  $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) $(srcdir)/*.pyc *.pyc
 
 FORCE:
 
 ifndef JS_STANDALONE
 check-preqs += check-jar-mn
 endif
 check-preqs += check-makefiles