diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-11-07 22:40:18 +0530 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2015-11-27 00:15:29 -0500 |
| commit | dc0e467945e7fb8eaf93f9e40e7ebcb2d5f52b0c (patch) | |
| tree | 5a4f80662d4c7b5b18adc49a325015e971380225 /python/servo/command_base.py | |
| parent | bc618b0d535e0e67a7ea845c026678113f000d64 (diff) | |
| download | servo-dc0e467945e7fb8eaf93f9e40e7ebcb2d5f52b0c.tar.gz servo-dc0e467945e7fb8eaf93f9e40e7ebcb2d5f52b0c.zip | |
Upgrade to rustc 1.6.0-nightly (d5fde83ae 2015-11-12)
… and libc 0.2 and many other dependencies
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index e702d3f76e3..b3b24f8df46 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -97,7 +97,7 @@ class CommandBase(object): self.config["tools"].setdefault("cargo-root", "") if not self.config["tools"]["system-rust"]: self.config["tools"]["rust-root"] = path.join( - context.sharedir, "rust", *self.rust_snapshot_path().split("/")) + context.sharedir, "rust", self.rust_snapshot_path()) if not self.config["tools"]["system-cargo"]: self.config["tools"]["cargo-root"] = path.join( context.sharedir, "cargo", self.cargo_build_id()) @@ -127,7 +127,8 @@ class CommandBase(object): filename = path.join(self.context.topdir, "rust-snapshot-hash") with open(filename) as f: snapshot_hash = f.read().strip() - self._rust_snapshot_path = "%s-%s" % (snapshot_hash, host_triple()) + self._rust_snapshot_path = ("%s/rustc-nightly-%s" % + (snapshot_hash, host_triple())) return self._rust_snapshot_path def cargo_build_id(self): @@ -337,6 +338,8 @@ class CommandBase(object): if not self.config["tools"]["system-rust"] and \ not path.exists(path.join( self.config["tools"]["rust-root"], "rustc", "bin", "rustc")): + print("looking for rustc at %s" % path.join( + self.config["tools"]["rust-root"], "rustc", "bin", "rustc")) Registrar.dispatch("bootstrap-rust", context=self.context) if not self.config["tools"]["system-cargo"] and \ not path.exists(path.join( |