Backed out changeset 11df51f97f13 (bug 1495293) for artifact build bustage
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Tue, 02 Oct 2018 05:36:29 +0300
changeset 439128 2b4331c9d829043af5513f3f1b97f53026928d8c
parent 439127 6568853848ac62384a094e521965e101978b1f62
child 439129 181d337b15bd2354fa1b910e735c1521ee8d7807
push id34757
push userrgurzau@mozilla.com
push dateTue, 02 Oct 2018 16:04:13 +0000
treeherdermozilla-central@17c314f6930d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1495293
milestone64.0a1
backs out11df51f97f138ade3124881b9a72a3d5e65fabba
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
Backed out changeset 11df51f97f13 (bug 1495293) for artifact build bustage
build/moz.configure/rust.configure
toolkit/moz.configure
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -347,24 +347,8 @@ def win64_cargo_linker_config(linker, en
         [target.x86_64-pc-windows-msvc]
         linker = "{objdir}/build/win64/cargo-linker.bat"
         '''.format(objdir=env.topobjdir))
     # We want an empty string here so we don't leave the @ variable in the config file.
     return ''
 
 
 set_config('WIN64_CARGO_LINKER_CONFIG', win64_cargo_linker_config)
-
-
-# SIMD acceleration for Rust code (currently just encoding_rs)
-
-js_option('--enable-rust-simd', env='MOZ_RUST_SIMD',
-          help='Enable explicit SIMD in Rust code.')
-
-@depends('--enable-rust-simd', target)
-def rust_simd(value, target):
-    # As of 2018-06-05, the simd crate only works on aarch64,
-    # armv7, x86 and x86_64.
-    if target.cpu in ('aarch64', 'arm', 'x86', 'x86_64') and value:
-        return True
-
-set_config('MOZ_RUST_SIMD', rust_simd)
-set_define('MOZ_RUST_SIMD', rust_simd)
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -643,16 +643,31 @@ def webrender(value):
         build = build_webrender,
         enable = enable_webrender,
     )
 
 set_config('MOZ_BUILD_WEBRENDER', webrender.build)
 set_define('MOZ_BUILD_WEBRENDER', webrender.build)
 set_config('MOZ_ENABLE_WEBRENDER', webrender.enable)
 
+# SIMD acceleration for Rust code (currently just encoding_rs)
+
+option('--enable-rust-simd', env='MOZ_RUST_SIMD',
+       help='Enable explicit SIMD in Rust code.')
+
+@depends('--enable-rust-simd', target)
+def rust_simd(value, target):
+    # As of 2018-06-05, the simd crate only works on aarch64,
+    # armv7, x86 and x86_64.
+    if target.cpu in ('aarch64', 'arm', 'x86', 'x86_64') and value:
+        return True
+
+set_config('MOZ_RUST_SIMD', rust_simd)
+set_define('MOZ_RUST_SIMD', rust_simd)
+
 # Printing
 # ==============================================================
 @depends(target)
 def ios_disable_printing(target):
     if target.os == 'iOS':
         return False
 
 imply_option('--enable-printing', ios_disable_printing, reason='--target')