Bug 1167222 - don't warn about out-of-date rustc when --enable-rust is not specified, r=ted-self-review-because-gps-said-so
authorTed Mielczarek <ted@mielczarek.org>
Tue, 26 May 2015 13:12:54 +0100
changeset 245589 e79a3dffaec93e815a2a38997597aa7af884dede
parent 245588 2f7bd935c50dc297a69ad6d9b51fa698dc7908cc
child 245590 0780ad7e729c0759fb5d22a96234981c8cda37f5
push id13159
push usergijskruitbosch@gmail.com
push dateTue, 26 May 2015 12:13:47 +0000
treeherderfx-team@e79a3dffaec9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted-self-review-because-gps-said-so
bugs1167222
milestone41.0a1
Bug 1167222 - don't warn about out-of-date rustc when --enable-rust is not specified, r=ted-self-review-because-gps-said-so
configure.in
--- a/configure.in
+++ b/configure.in
@@ -426,17 +426,17 @@ MOZ_ARG_ENABLE_BOOL([rust],
                     [  --enable-rust           Include rust language sources],
                     [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" -a -z "$_RUSTC_MAJOR_VERSION" -o \
+if test -n "$MOZ_RUST" && test -z "$_RUSTC_MAJOR_VERSION" -o \
   "$_RUSTC_MAJOR_VERSION" -lt 1; 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
     first in your path.
     You can verify this by typing 'rustc --version'.])
 fi
 AC_SUBST(MOZ_RUST)