Bug 1541179 - Part 11: Update and tidy suite/app/ build files. r=frg a=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Thu, 11 Apr 2019 20:30:44 +0200
changeset 32171 4353454cfd13
parent 32170 382cd01f1369
child 32172 3fd05f0a77b5
push id183
push userfrgrahl@gmx.net
push dateThu, 11 Apr 2019 18:31:37 +0000
treeherdercomm-esr60@8e29ae45df19 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1541179, 793735, 858928
Bug 1541179 - Part 11: Update and tidy suite/app/ build files. r=frg a=frg Port Bug 793735 [Make XRE_StartupTimelineRecord() generate TimeStamps and modify its callers to use the appropriate timers]. Port Bug 858928 [Switch XRE_StartupTimelineRecord() from PRTime to TimeStamp].
suite/app/moz.build
--- a/suite/app/moz.build
+++ b/suite/app/moz.build
@@ -60,19 +60,24 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_
 #
 # The default heap size is 1MB on Win32.
 # The heap will grow if need be.
 #
 # Set it to 256k.  See bug 127069.
 if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CC_TYPE'] not in ('clang', 'gcc'):
     LDFLAGS += ['/HEAP:0x40000']
 
+DisableStlWrapping()
+
 if CONFIG['MOZ_LINKER']:
     OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
 
+if CONFIG['HAVE_CLOCK_MONOTONIC']:
+    OS_LIBS += CONFIG['REALTIME_LIBS']
+
 if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERROR']:
     DEFINES['MOZ_LINUX_32_SSE2_STARTUP_ERROR'] = True
     COMPILE_FLAGS['OS_CXXFLAGS'] = [
         f for f in COMPILE_FLAGS.get('OS_CXXFLAGS', [])
         if not f.startswith('-march=') and f not in ('-msse', '-msse2', '-mfpmath=sse')
     ] + [
         '-mno-sse', '-mno-sse2', '-mfpmath=387',
     ]
@@ -80,13 +85,11 @@ if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERR
 # For splash.rc
 DEFINES['SEAMONKEY_ICO'] = '"%s/%s/icons/windows/main-window.ico"' % (
     TOPSRCDIR, CONFIG['MOZ_BRANDING_DIRECTORY'])
 DEFINES['HTML_FILE_ICO'] = '"%s/%s/icons/windows/html-file.ico"' % (
     TOPSRCDIR, CONFIG['MOZ_BRANDING_DIRECTORY'])
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
-DisableStlWrapping()
-
 FINAL_TARGET_FILES += ['blocklist.xml']
 FINAL_TARGET_FILES.defaults += ['permissions']