From d0a2f7bcbe7ebf8364ad03b9e1493dd2dee98359 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 21 Jul 2017 13:57:07 +0200
Subject: [PATCH] Fix bootstrapping during `mach rustup` without system cargo

https://travis-ci.org/servo/servo-with-rust-nightly/builds/255611949#L989
---
 python/servo/devenv_commands.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py
index e66fa7b457de..dae6a38b0baa 100644
--- a/python/servo/devenv_commands.py
+++ b/python/servo/devenv_commands.py
@@ -284,6 +284,9 @@ def rustup(self, master=False):
         # 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()