Backed out changeset e9bbe52bbd8d (bug 1540788) for breaking bootstrap. a=backout
authorGurzau Raul <rgurzau@mozilla.com>
Wed, 03 Apr 2019 05:31:38 +0300
changeset 467617 a53585c83f44d09c2d7f29e07af5d426a7f61084
parent 467616 48ae682107da10c0d8ffbdf6e1a10771c5fd2e05
child 467658 45808ab18609bfd3b69c6ae2d21e2b50f5177a02
push id35805
push userrgurzau@mozilla.com
push dateWed, 03 Apr 2019 02:32:11 +0000
treeherdermozilla-central@a53585c83f44 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1540788
milestone68.0a1
backs oute9bbe52bbd8d00f61ffb0d191a596e2b005d715f
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 e9bbe52bbd8d (bug 1540788) for breaking bootstrap. a=backout
python/mozboot/mozboot/base.py
--- a/python/mozboot/mozboot/base.py
+++ b/python/mozboot/mozboot/base.py
@@ -668,17 +668,17 @@ class BaseBootstrapper(object):
     def ensure_rust_modern(self):
         cargo_home, cargo_bin = self.cargo_home()
         modern, version = self.is_rust_modern(cargo_bin)
 
         if modern:
             print('Your version of Rust (%s) is new enough.' % version)
             rustup = self.which('rustup', cargo_bin)
             if rustup:
-                self.ensure_rust_targets(rustup, version)
+                self.ensure_rust_targets(rustup)
             return
 
         if version:
             print('Your version of Rust (%s) is too old.' % version)
 
         rustup = self.which('rustup', cargo_bin)
         if rustup:
             rustup_version = self._parse_version(rustup)
@@ -692,36 +692,32 @@ class BaseBootstrapper(object):
             if not modern:
                 print(RUST_UPGRADE_FAILED % (MODERN_RUST_VERSION, after))
                 sys.exit(1)
         else:
             # No rustup. Download and run the installer.
             print('Will try to install Rust.')
             self.install_rust()
 
-    def ensure_rust_targets(self, rustup, rust_version):
+    def ensure_rust_targets(self, rustup):
         """Make sure appropriate cross target libraries are installed."""
         target_list = subprocess.check_output([rustup, 'target', 'list'])
         targets = [line.split()[0] for line in target_list.splitlines()
                    if 'installed' in line or 'default' in line]
         print('Rust supports %s targets.' % ', '.join(targets))
 
         # Support 32-bit Windows on 64-bit Windows.
         win32 = 'i686-pc-windows-msvc'
         win64 = 'x86_64-pc-windows-msvc'
         if rust.platform() == win64 and win32 not in targets:
             subprocess.check_call([rustup, 'target', 'add', win32])
 
         if 'mobile_android' in self.application:
             # Let's add the most common targets.
-            if LooseVersion(rust_version) < '1.33':
-                arm_target = 'armv7-linux-androideabi'
-            else:
-                arm_target = 'thumbv7neon-linux-androideabi'
-            android_targets = (arm_target,
+            android_targets = ('thumbv7neon-linux-androideabi',
                                'aarch64-linux-android',
                                'i686-linux-android',
                                'x86_64-linux-android', )
             for target in android_targets:
                 if target not in targets:
                     subprocess.check_call([rustup, 'target', 'add', target])
 
     def upgrade_rust(self, rustup):