Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mach: Fix cargo-geckolib check / cargo-geckolib build after #19476. #19539

Merged
merged 2 commits into from Dec 14, 2017
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

mach: Remove redundant with(crate_dir).

  • Loading branch information
emilio committed Dec 13, 2017
commit 5dfa144c5dad275e5dd87f69591529aab70a8b7e
@@ -8,7 +8,7 @@
# except according to those terms.

from __future__ import print_function, unicode_literals
from os import path, getcwd, listdir
from os import path, listdir
from time import time

import sys
@@ -50,16 +50,9 @@ def run_cargo(self, params, geckolib=False, check=False):
params[1:1] = ['--package', 'geckoservo']

self.set_use_stable_rust()
crate_dir = path.join('ports', 'geckolib')
else:
crate_dir = path.join('ports', 'servo')

build_start = time()
if self.context.topdir == getcwd():
with cd(crate_dir):
status = call(['cargo'] + params, env=env)
else:
status = call(['cargo'] + params, env=env)
status = call(['cargo'] + params, env=env)
elapsed = time() - build_start

notify_build_done(self.config, elapsed, status == 0)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.