Bug 1531655 - Emit a configure error if rustc version >= 1.33 and --enable-rust-simd used. r=glandium a=lizzard
authorHenri Sivonen <hsivonen@hsivonen.fi>
Fri, 01 Mar 2019 10:08:24 +0000
changeset 516245 561a9eb1b304f2900cd76431e6e0e5fda539bce7
parent 516244 30b95d4795f8658f5495148161eedfd4a838b5b2
child 516246 6982cfd315d06696d320bc929822da2725c873f1
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, lizzard
bugs1531655
milestone66.0
Bug 1531655 - Emit a configure error if rustc version >= 1.33 and --enable-rust-simd used. r=glandium a=lizzard Differential Revision: https://phabricator.services.mozilla.com/D21649
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -689,21 +689,24 @@ set_define('MOZ_BUILD_WEBRENDER', webren
 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):
+@depends('--enable-rust-simd', target, rustc_info)
+def rust_simd(value, target, rustc_info):
     # 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:
+        if rustc_info and rustc_info.version >= Version('1.33.0'):
+            die('--enable-rust-simd does not work with Rust 1.33 or later. '
+                'See https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 .')
         return True
 
 set_config('MOZ_RUST_SIMD', rust_simd)
 set_define('MOZ_RUST_SIMD', rust_simd)
 
 # Printing
 # ==============================================================
 @depends(target)