auto merge of #4992 : psdh/servo/cargodir, r=Manishearth

Fixes #4976
This commit is contained in:
bors-servo 2015-02-20 16:24:53 -07:00
commit ff10deb814

View file

@ -1,5 +1,5 @@
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
from os import path from os import path, getcwd
import subprocess import subprocess
@ -23,8 +23,13 @@ class MachCommands(CommandBase):
def cargo(self, params): def cargo(self, params):
if not params: if not params:
params = [] params = []
if self.context.topdir == getcwd():
with cd(path.join('components', 'servo')):
return subprocess.call(["cargo"] + params, return subprocess.call(["cargo"] + params,
env=self.build_env()) env=self.build_env())
return subprocess.call(['cargo'] + params,
env=self.build_env())
@Command('update-cargo', @Command('update-cargo',
description='Update Cargo dependencies', description='Update Cargo dependencies',