Bug 1223093 - Bump required rustc version to 1.4. r=mshal
authorRalph Giles <giles@mozilla.com>
Mon, 09 Nov 2015 10:53:00 -0800
changeset 271950 145935666adb94e2b19ab38ae9ce62a3b203b8dc
parent 271949 67f8880bc989a52e52b708b1495c27ed48ca06e5
child 271951 a927ab4b112a81e18cb26a4e0dc0ce182f48cf80
push id67816
push userrgiles@mozilla.com
push dateTue, 10 Nov 2015 18:59:00 +0000
treeherdermozilla-inbound@145935666adb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1223093, 1220754
milestone45.0a1
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
Bug 1223093 - Bump required rustc version to 1.4. r=mshal Bug 1220754 added code which requires feaures in the rust 1.4 standard library. Update our configure version check so we catch this up front.
build/autoconf/rust.m4
--- a/build/autoconf/rust.m4
+++ b/build/autoconf/rust.m4
@@ -19,17 +19,18 @@ AC_DEFUN([MOZ_RUST_SUPPORT], [
                       [MOZ_RUST=1],
                       [MOZ_RUST= ])
   if test -z "$RUSTC" -a -n "$MOZ_RUST"; then
     AC_MSG_ERROR([Rust compiler not found.
       To compile rust language sources, you must have 'rustc' in your path.
       See http://www.rust-lang.org/ for more information.])
   fi
   if test -n "$MOZ_RUST" && test -z "$_RUSTC_MAJOR_VERSION" -o \
-    "$_RUSTC_MAJOR_VERSION" -lt 1; then
+    "$_RUSTC_MAJOR_VERSION" -lt 1 -o \
+    \( "$_RUSTC_MAJOR_VERSION" -eq 1 -a "$_RUSTC_MINOR_VERSION" -lt 4 \); then
     AC_MSG_ERROR([Rust compiler ${RUSTC_VERSION} is too old.
       To compile Rust language sources please install at least
-      version 1.0 of the 'rustc' toolchain and make sure it is
+      version 1.4 of the 'rustc' toolchain and make sure it is
       first in your path.
       You can verify this by typing 'rustc --version'.])
   fi
   AC_SUBST(MOZ_RUST)
 ])