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

Use a stable compiler for build-geckolib #12319

Merged
merged 8 commits into from Jul 9, 2016

Remove the "./mach build-stable" subcommand

It is replaced by "./mach build-gecklibo" using stable Rust.
  • Loading branch information
SimonSapin committed Jul 8, 2016
commit 79ef0a5d7f4930b6b970d993a633db65b5ff7349
@@ -265,43 +265,6 @@ def build(self, target=None, release=False, dev=False, jobs=None,
print("Build completed in %s" % format_duration(elapsed))
return status

@Command('build-stable',
description='Build Servo using stable rustc',
category='build')
@CommandArgument('--target', '-t',
default=None,
help='Cross compile for given target platform')
@CommandArgument('--release', '-r',
action='store_true',
help='Build in release mode')
@CommandArgument('--dev', '-d',
action='store_true',
help='Build in development mode')
@CommandArgument('--jobs', '-j',
default=None,
help='Number of jobs to run in parallel')
@CommandArgument('--features',
default=None,
help='Space-separated list of features to also build',
nargs='+')
@CommandArgument('--android',
default=None,
action='store_true',
help='Build for Android')
@CommandArgument('--debug-mozjs',
default=None,
action='store_true',
help='Enable debug assertions in mozjs')
@CommandArgument('--verbose', '-v',
action='store_true',
help='Print verbose output')
@CommandArgument('params', nargs='...',
help="Command-line arguments to be passed through to Cargo")
def build_stable(self, target=None, release=False, dev=False, jobs=None,
features=None, android=None, verbose=False, debug_mozjs=False, params=None):
self.set_use_stable_rust()
self.build(target, release, dev, jobs, features, android, verbose, debug_mozjs, params)

@Command('build-cef',
description='Build the Chromium Embedding Framework library',
category='build')
@@ -333,10 +333,7 @@ def build_env(self, hosts_file_path=None, target=None):

env["CARGO_HOME"] = self.config["tools"]["cargo-home-dir"]

if self.use_stable_rust():
env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "ports/stable-rust/target")
elif "CARGO_TARGET_DIR" not in env:
env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target")
env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target")

if extra_lib:
if sys.platform == "darwin":
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.