Backed out 2 changesets (bug 1208566) for breaking mulet builds
authorWes Kocher <wkocher@mozilla.com>
Thu, 17 Dec 2015 09:34:33 -0800
changeset 311971 46abb0f41d94cdd0b092fab7e0bdb36bc571df0f
parent 311970 cc002565421a4a26a4c1a7b3807936f1ca5127b6
child 311972 ce51411b731f62cce960d3ad6cb9e3720767f790
push id5703
push userraliiev@mozilla.com
push dateMon, 07 Mar 2016 14:18:41 +0000
treeherdermozilla-beta@31e373ad5b5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1208566
milestone46.0a1
backs outa5618a5cbc7fe93b5401b2e5aa51e4084c315472
f3fd530324ee1054b75e5193031cc75d5cefc408
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 2 changesets (bug 1208566) for breaking mulet builds Backed out changeset a5618a5cbc7f (bug 1208566) Backed out changeset f3fd530324ee (bug 1208566)
build/autoconf/rust.m4
config/rules.mk
--- a/build/autoconf/rust.m4
+++ b/build/autoconf/rust.m4
@@ -20,17 +20,17 @@ AC_DEFUN([MOZ_RUST_SUPPORT], [
                       [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 -o \
-    \( "$_RUSTC_MAJOR_VERSION" -eq 1 -a "$_RUSTC_MINOR_VERSION" -lt 5 \); then
+    \( "$_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.5 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)
 ])
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -940,17 +940,17 @@ ifdef ASFILES
 	$(AS) $(ASOUTOPTION)$@ $(ASFLAGS) $($(notdir $<)_FLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
 endif
 
 ifdef MOZ_RUST
 # Assume any system libraries rustc links against are already
 # in the target's LIBS.
 $(RSOBJS):
 	$(REPORT_BUILD)
-	$(RUSTC) $(RUSTFLAGS) --crate-type staticlib --emit dep-info=$(MDDEPDIR)/$(call mk_libname,$<).pp,link=$(call mk_libname,$<) $(_VPATH_SRCS)
+	$(RUSTC) $(RUSTFLAGS) --crate-type staticlib -o $(call mk_libname,$<) $(_VPATH_SRCS)
 endif
 
 $(SOBJS):
 	$(REPORT_BUILD)
 	$(AS) -o $@ $(ASFLAGS) $($(notdir $<)_FLAGS) $(LOCAL_INCLUDES) $(TARGET_LOCAL_INCLUDES) -c $<
 
 $(CPPOBJS):
 	$(REPORT_BUILD)