Bug 1339075 - stylo: don't force mozjemalloc on Tier3 platforms. r=froydnj
authorJan Beich <jbeich@FreeBSD.org>
Wed, 22 Feb 2017 08:22:08 +0000
changeset 373420 27dade5e0c8350189eeb6495d70a9fb25ce137a9
parent 373419 20a81b2adf80e957b66aa861ff8159198c7d3684
child 373499 c02dd6a7e9c193b488271eb53e3ea039042c9ed6
child 373513 58659a84e538f102d76fd2a142dc15834d23dcb7
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Bug 1339075 - stylo: don't force mozjemalloc on Tier3 platforms. r=froydnj MozReview-Commit-ID: 91ONYHQ9zzU
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -665,19 +665,21 @@ def stylo(stylo_enabled, bindgen_config_
 set_config('MOZ_STYLO', delayed_getattr(stylo, 'enabled'))
 set_define('MOZ_STYLO', delayed_getattr(stylo, 'enabled'))
 set_config('MOZ_LIBCLANG_PATH', delayed_getattr(stylo, 'libclang_path'))
 set_config('MOZ_CLANG_PATH', delayed_getattr(stylo, 'clang_path'))
 set_config('MOZ_STYLO_BINDGEN', delayed_getattr(stylo, 'bindgen_enabled'))
-@depends(stylo, dmd)
-def jemalloc(stylo, dmd):
-    if stylo:
+@depends(stylo, target, dmd)
+def jemalloc(stylo, target, dmd):
+    if stylo and target.kernel in ('Darwin', 'Linux', 'WINNT'):
+        # Avoid a moving performance target if the default allocator
+        # is changed on Tier1 platforms (see bug 1291356).
         return 'moz'
     elif dmd:
         return True
 imply_option('--enable-jemalloc', jemalloc,
              reason='--enable-dmd or --enable-stylo')
 option('--with-servo', env='SERVO_TARGET_DIR', nargs=1,