servo: Merge #17815 - Fix bootstrapping during `mach rustup` without system cargo (from servo:bootstrap); r=nox
authorSimon Sapin <simon.sapin@exyr.org>
Fri, 21 Jul 2017 05:00:56 -0700
changeset 418870 ed9a8d8a28969ffa461d14fd5febfe437408141c
parent 418869 cd19f7fa51603a562488956d30a1e75a740e79be
child 418871 a2bfff6c59b16b7c999c7620fdc3b596291b1970
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnox
bugs17815
milestone56.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
servo: Merge #17815 - Fix bootstrapping during `mach rustup` without system cargo (from servo:bootstrap); r=nox https://travis-ci.org/servo/servo-with-rust-nightly/builds/255611949#L989 Source-Repo: https://github.com/servo/servo Source-Revision: 3854e8f174a834c72bf93c7a76bb33c80021a970
servo/python/servo/devenv_commands.py
--- a/servo/python/servo/devenv_commands.py
+++ b/servo/python/servo/devenv_commands.py
@@ -279,16 +279,19 @@ class MachCommands(CommandBase):
             commit = json.load(urllib2.urlopen(url))["sha"]
         filename = path.join(self.context.topdir, "rust-commit-hash")
         with open(filename, "w") as f:
             f.write(commit + "\n")
 
         # Reset self.config["tools"]["rust-root"]
         self._rust_version = None
         self.set_use_stable_rust(False)
+
+        # Reset self.config["tools"]["cargo-root"]
+        self._cargo_build_id = None
         self.set_cargo_root()
 
         self.fetch()
 
     @Command('fetch',
              description='Fetch Rust, Cargo and Cargo dependencies',
              category='devenv')
     def fetch(self):