Backed out changeset a77fb6a85fc8 (bug 1315695) for breaking PGO

This commit is contained in:
Gregory Szorc 2016-11-16 11:15:05 -08:00
parent 2efcd6796f
commit aa43a43343
2 changed files with 4 additions and 6 deletions

View File

@ -657,9 +657,8 @@ ifdef MSMANIFEST_TOOL
endif # MSVC with manifest tool
ifdef MOZ_PROFILE_GENERATE
# touch it a few seconds into the future to work around FAT's
# 2-second granularity. We can't touch `touch -t` here because it isn't timezone
# aware.
$(PYTHON) -c 'import os, time; now = int(time.time()); os.utime("pgo.relink", (now + 5, now + 5));'
# 2-second granularity
touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
endif
else # !WINNT || GNU_CC
$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)

View File

@ -270,9 +270,8 @@ ifdef MT
endif # MSVC with manifest tool
ifdef MOZ_PROFILE_GENERATE
# touch it a few seconds into the future to work around FAT's
# 2-second granularity. We can't touch `touch -t` here because it isn't timezone
# aware.
$(PYTHON) -c 'import os, time; now = int(time.time()); os.utime("pgo.relink", (now + 5, now + 5));'
# 2-second granularity
touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
endif # MOZ_PROFILE_GENERATE
else # WINNT && !GCC
$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(WRAP_LDFLAGS)