2017-07-05 10:20:20 -06:00
|
|
|
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2017-09-15 09:40:35 -07:00
|
|
|
use std::any::Any;
|
|
|
|
use std::cell::RefCell;
|
|
|
|
use std::collections::BTreeSet;
|
|
|
|
use std::env;
|
2017-07-13 18:48:44 -06:00
|
|
|
use std::fmt::Debug;
|
2017-09-15 09:40:35 -07:00
|
|
|
use std::fs;
|
2017-07-13 18:48:44 -06:00
|
|
|
use std::hash::Hash;
|
2017-09-15 09:40:35 -07:00
|
|
|
use std::ops::Deref;
|
2017-07-05 10:20:20 -06:00
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use std::process::Command;
|
|
|
|
|
|
|
|
use compile;
|
|
|
|
use install;
|
|
|
|
use dist;
|
|
|
|
use util::{exe, libdir, add_lib_path};
|
|
|
|
use {Build, Mode};
|
2017-07-13 18:48:44 -06:00
|
|
|
use cache::{INTERNER, Interned, Cache};
|
2017-07-05 10:20:20 -06:00
|
|
|
use check;
|
2018-01-15 10:44:00 -07:00
|
|
|
use test;
|
2017-07-05 10:20:20 -06:00
|
|
|
use flags::Subcommand;
|
|
|
|
use doc;
|
2017-07-04 10:03:01 -06:00
|
|
|
use tool;
|
2017-07-29 13:39:43 -07:00
|
|
|
use native;
|
2017-07-05 10:20:20 -06:00
|
|
|
|
2017-07-05 10:46:41 -06:00
|
|
|
pub use Compiler;
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
pub struct Builder<'a> {
|
|
|
|
pub build: &'a Build,
|
|
|
|
pub top_stage: u32,
|
|
|
|
pub kind: Kind,
|
|
|
|
cache: Cache,
|
2017-07-17 18:01:48 -06:00
|
|
|
stack: RefCell<Vec<Box<Any>>>,
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Deref for Builder<'a> {
|
|
|
|
type Target = Build;
|
|
|
|
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
|
|
self.build
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-13 18:48:44 -06:00
|
|
|
pub trait Step: 'static + Clone + Debug + PartialEq + Eq + Hash {
|
2017-07-07 11:17:37 -06:00
|
|
|
/// `PathBuf` when directories are created or to return a `Compiler` once
|
|
|
|
/// it's been assembled.
|
2017-07-13 18:48:44 -06:00
|
|
|
type Output: Clone;
|
2017-07-13 11:12:57 -06:00
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
const DEFAULT: bool = false;
|
|
|
|
|
2017-07-07 11:17:37 -06:00
|
|
|
/// Run this rule for all hosts without cross compiling.
|
2017-07-05 10:20:20 -06:00
|
|
|
const ONLY_HOSTS: bool = false;
|
|
|
|
|
|
|
|
/// Run this rule for all targets, but only with the native host.
|
|
|
|
const ONLY_BUILD_TARGETS: bool = false;
|
|
|
|
|
|
|
|
/// Only run this step with the build triple as host and target.
|
|
|
|
const ONLY_BUILD: bool = false;
|
|
|
|
|
2017-07-07 11:17:37 -06:00
|
|
|
/// Primary function to execute this rule. Can call `builder.ensure(...)`
|
|
|
|
/// with other steps to run those.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn run(self, builder: &Builder) -> Self::Output;
|
2017-07-05 10:20:20 -06:00
|
|
|
|
2017-07-07 11:17:37 -06:00
|
|
|
/// When bootstrap is passed a set of paths, this controls whether this rule
|
|
|
|
/// will execute. However, it does not get called in a "default" context
|
|
|
|
/// when we are not passed any paths; in that case, make_run is called
|
|
|
|
/// directly.
|
2017-07-18 18:03:38 -06:00
|
|
|
fn should_run(run: ShouldRun) -> ShouldRun;
|
2017-07-05 10:20:20 -06:00
|
|
|
|
2017-07-07 11:17:37 -06:00
|
|
|
/// Build up a "root" rule, either as a default rule or from a path passed
|
|
|
|
/// to us.
|
|
|
|
///
|
|
|
|
/// When path is `None`, we are executing in a context where no paths were
|
|
|
|
/// passed. When `./x.py build` is run, for example, this rule could get
|
|
|
|
/// called if it is in the correct list below with a path of `None`.
|
2017-07-20 17:51:07 -06:00
|
|
|
fn make_run(_run: RunConfig) {
|
2017-07-14 06:30:16 -06:00
|
|
|
// It is reasonable to not have an implementation of make_run for rules
|
|
|
|
// who do not want to get called from the root context. This means that
|
|
|
|
// they are likely dependencies (e.g., sysroot creation) or similar, and
|
|
|
|
// as such calling them from ./x.py isn't logical.
|
|
|
|
unimplemented!()
|
|
|
|
}
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
|
2017-07-20 17:51:07 -06:00
|
|
|
pub struct RunConfig<'a> {
|
|
|
|
pub builder: &'a Builder<'a>,
|
|
|
|
pub host: Interned<String>,
|
|
|
|
pub target: Interned<String>,
|
2018-02-13 18:42:26 -07:00
|
|
|
pub path: PathBuf,
|
2017-07-20 17:51:07 -06:00
|
|
|
}
|
|
|
|
|
2017-07-19 06:55:46 -06:00
|
|
|
struct StepDescription {
|
|
|
|
default: bool,
|
|
|
|
only_hosts: bool,
|
|
|
|
only_build_targets: bool,
|
|
|
|
only_build: bool,
|
|
|
|
should_run: fn(ShouldRun) -> ShouldRun,
|
2017-07-20 17:51:07 -06:00
|
|
|
make_run: fn(RunConfig),
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
name: &'static str,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq)]
|
|
|
|
struct PathSet {
|
|
|
|
set: BTreeSet<PathBuf>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PathSet {
|
2018-02-13 18:42:26 -07:00
|
|
|
fn empty() -> PathSet {
|
|
|
|
PathSet { set: BTreeSet::new() }
|
|
|
|
}
|
|
|
|
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
fn one<P: Into<PathBuf>>(path: P) -> PathSet {
|
|
|
|
let mut set = BTreeSet::new();
|
|
|
|
set.insert(path.into());
|
|
|
|
PathSet { set }
|
|
|
|
}
|
|
|
|
|
|
|
|
fn has(&self, needle: &Path) -> bool {
|
|
|
|
self.set.iter().any(|p| p.ends_with(needle))
|
|
|
|
}
|
|
|
|
|
2018-02-13 18:42:26 -07:00
|
|
|
fn path(&self, builder: &Builder) -> PathBuf {
|
|
|
|
self.set.iter().next().unwrap_or(&builder.build.src).to_path_buf()
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
}
|
2017-07-19 06:55:46 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl StepDescription {
|
|
|
|
fn from<S: Step>() -> StepDescription {
|
|
|
|
StepDescription {
|
|
|
|
default: S::DEFAULT,
|
|
|
|
only_hosts: S::ONLY_HOSTS,
|
|
|
|
only_build_targets: S::ONLY_BUILD_TARGETS,
|
|
|
|
only_build: S::ONLY_BUILD,
|
|
|
|
should_run: S::should_run,
|
|
|
|
make_run: S::make_run,
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
name: unsafe { ::std::intrinsics::type_name::<S>() },
|
2017-07-19 06:55:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
fn maybe_run(&self, builder: &Builder, pathset: &PathSet) {
|
|
|
|
if builder.config.exclude.iter().any(|e| pathset.has(e)) {
|
|
|
|
eprintln!("Skipping {:?} because it is excluded", pathset);
|
|
|
|
return;
|
|
|
|
} else if !builder.config.exclude.is_empty() {
|
|
|
|
eprintln!("{:?} not skipped for {:?} -- not in {:?}", pathset,
|
|
|
|
self.name, builder.config.exclude);
|
2018-02-09 13:40:23 -07:00
|
|
|
}
|
2017-07-19 06:55:46 -06:00
|
|
|
let build = builder.build;
|
|
|
|
let hosts = if self.only_build_targets || self.only_build {
|
2017-07-29 22:12:53 -06:00
|
|
|
build.build_triple()
|
2017-07-19 06:55:46 -06:00
|
|
|
} else {
|
|
|
|
&build.hosts
|
|
|
|
};
|
|
|
|
|
2017-07-29 22:12:53 -06:00
|
|
|
// Determine the targets participating in this rule.
|
2017-07-19 06:55:46 -06:00
|
|
|
let targets = if self.only_hosts {
|
2017-08-10 21:17:42 +05:00
|
|
|
if build.config.run_host_only {
|
2017-07-19 06:55:46 -06:00
|
|
|
&[]
|
|
|
|
} else if self.only_build {
|
2017-07-29 22:12:53 -06:00
|
|
|
build.build_triple()
|
2017-07-19 06:55:46 -06:00
|
|
|
} else {
|
2017-07-29 22:12:53 -06:00
|
|
|
&build.hosts
|
2017-07-19 06:55:46 -06:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
&build.targets
|
|
|
|
};
|
|
|
|
|
|
|
|
for host in hosts {
|
|
|
|
for target in targets {
|
2017-07-20 17:51:07 -06:00
|
|
|
let run = RunConfig {
|
|
|
|
builder,
|
2018-02-13 18:42:26 -07:00
|
|
|
path: pathset.path(builder),
|
2017-07-20 17:51:07 -06:00
|
|
|
host: *host,
|
|
|
|
target: *target,
|
|
|
|
};
|
|
|
|
(self.make_run)(run);
|
2017-07-19 06:55:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(v: &[StepDescription], builder: &Builder, paths: &[PathBuf]) {
|
2017-07-20 17:24:11 -06:00
|
|
|
let should_runs = v.iter().map(|desc| {
|
|
|
|
(desc.should_run)(ShouldRun::new(builder))
|
|
|
|
}).collect::<Vec<_>>();
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
|
|
|
|
// sanity checks on rules
|
|
|
|
for (desc, should_run) in v.iter().zip(&should_runs) {
|
|
|
|
assert!(!should_run.paths.is_empty(),
|
|
|
|
"{:?} should have at least one pathset", desc.name);
|
|
|
|
}
|
|
|
|
|
2017-07-19 06:55:46 -06:00
|
|
|
if paths.is_empty() {
|
2017-07-20 17:24:11 -06:00
|
|
|
for (desc, should_run) in v.iter().zip(should_runs) {
|
|
|
|
if desc.default && should_run.is_really_default {
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
for pathset in &should_run.paths {
|
|
|
|
desc.maybe_run(builder, pathset);
|
|
|
|
}
|
2017-07-19 06:55:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for path in paths {
|
|
|
|
let mut attempted_run = false;
|
2017-07-20 17:24:11 -06:00
|
|
|
for (desc, should_run) in v.iter().zip(&should_runs) {
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
if let Some(pathset) = should_run.pathset_for_path(path) {
|
2017-07-19 06:55:46 -06:00
|
|
|
attempted_run = true;
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
desc.maybe_run(builder, pathset);
|
2017-07-19 06:55:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !attempted_run {
|
2018-02-15 18:01:26 -07:00
|
|
|
panic!("Error: no rules matched {}.", path.display());
|
2017-07-19 06:55:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-18 18:03:38 -06:00
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct ShouldRun<'a> {
|
2017-07-20 17:24:11 -06:00
|
|
|
pub builder: &'a Builder<'a>,
|
2017-07-18 18:03:38 -06:00
|
|
|
// use a BTreeSet to maintain sort order
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
paths: BTreeSet<PathSet>,
|
2017-07-20 17:24:11 -06:00
|
|
|
|
|
|
|
// If this is a default rule, this is an additional constraint placed on
|
2018-02-22 03:13:34 +08:00
|
|
|
// its run. Generally something like compiler docs being enabled.
|
2017-07-20 17:24:11 -06:00
|
|
|
is_really_default: bool,
|
2017-07-18 18:03:38 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> ShouldRun<'a> {
|
|
|
|
fn new(builder: &'a Builder) -> ShouldRun<'a> {
|
|
|
|
ShouldRun {
|
2017-08-06 22:54:09 -07:00
|
|
|
builder,
|
2017-07-18 18:03:38 -06:00
|
|
|
paths: BTreeSet::new(),
|
2017-07-20 17:24:11 -06:00
|
|
|
is_really_default: true, // by default no additional conditions
|
2017-07-18 18:03:38 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-20 17:24:11 -06:00
|
|
|
pub fn default_condition(mut self, cond: bool) -> Self {
|
|
|
|
self.is_really_default = cond;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
// Unlike `krate` this will create just one pathset. As such, it probably shouldn't actually
|
|
|
|
// ever be used, but as we transition to having all rules properly handle passing krate(...) by
|
|
|
|
// actually doing something different for every crate passed.
|
|
|
|
pub fn all_krates(mut self, name: &str) -> Self {
|
|
|
|
let mut set = BTreeSet::new();
|
|
|
|
for krate in self.builder.in_tree_crates(name) {
|
|
|
|
set.insert(PathBuf::from(&krate.path));
|
|
|
|
}
|
|
|
|
self.paths.insert(PathSet { set });
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2017-07-18 18:03:38 -06:00
|
|
|
pub fn krate(mut self, name: &str) -> Self {
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
for krate in self.builder.in_tree_crates(name) {
|
|
|
|
self.paths.insert(PathSet::one(&krate.path));
|
2017-07-18 18:03:38 -06:00
|
|
|
}
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
// single, non-aliased path
|
|
|
|
pub fn path(self, path: &str) -> Self {
|
|
|
|
self.paths(&[path])
|
|
|
|
}
|
|
|
|
|
|
|
|
// multiple aliases for the same job
|
|
|
|
pub fn paths(mut self, paths: &[&str]) -> Self {
|
|
|
|
self.paths.insert(PathSet {
|
|
|
|
set: paths.iter().map(PathBuf::from).collect(),
|
|
|
|
});
|
2017-07-18 18:03:38 -06:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
// allows being more explicit about why should_run in Step returns the value passed to it
|
2018-02-13 18:42:26 -07:00
|
|
|
pub fn never(mut self) -> ShouldRun<'a> {
|
|
|
|
self.paths.insert(PathSet::empty());
|
2017-07-18 18:03:38 -06:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
fn pathset_for_path(&self, path: &Path) -> Option<&PathSet> {
|
|
|
|
self.paths.iter().find(|pathset| pathset.has(path))
|
2017-07-18 18:03:38 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
|
|
|
|
pub enum Kind {
|
|
|
|
Build,
|
2018-01-15 10:44:00 -07:00
|
|
|
Check,
|
2017-07-05 10:20:20 -06:00
|
|
|
Test,
|
|
|
|
Bench,
|
|
|
|
Dist,
|
|
|
|
Doc,
|
|
|
|
Install,
|
|
|
|
}
|
|
|
|
|
2017-07-19 06:55:46 -06:00
|
|
|
impl<'a> Builder<'a> {
|
|
|
|
fn get_step_descriptions(kind: Kind) -> Vec<StepDescription> {
|
|
|
|
macro_rules! describe {
|
|
|
|
($($rule:ty),+ $(,)*) => {{
|
|
|
|
vec![$(StepDescription::from::<$rule>()),+]
|
|
|
|
}};
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
2017-07-19 06:55:46 -06:00
|
|
|
match kind {
|
|
|
|
Kind::Build => describe!(compile::Std, compile::Test, compile::Rustc,
|
|
|
|
compile::StartupObjects, tool::BuildManifest, tool::Rustbook, tool::ErrorIndex,
|
|
|
|
tool::UnstableBookGen, tool::Tidy, tool::Linkchecker, tool::CargoTest,
|
|
|
|
tool::Compiletest, tool::RemoteTestServer, tool::RemoteTestClient,
|
2017-08-15 14:27:20 +02:00
|
|
|
tool::RustInstaller, tool::Cargo, tool::Rls, tool::Rustdoc, tool::Clippy,
|
2017-08-28 16:54:50 +02:00
|
|
|
native::Llvm, tool::Rustfmt, tool::Miri),
|
2018-01-15 10:44:00 -07:00
|
|
|
Kind::Check => describe!(check::Std, check::Test, check::Rustc),
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
Kind::Test => describe!(test::Tidy, test::Bootstrap, test::Ui, test::RunPass,
|
|
|
|
test::CompileFail, test::ParseFail, test::RunFail, test::RunPassValgrind,
|
|
|
|
test::MirOpt, test::Codegen, test::CodegenUnits, test::Incremental, test::Debuginfo,
|
|
|
|
test::UiFullDeps, test::RunPassFullDeps, test::RunFailFullDeps,
|
|
|
|
test::CompileFailFullDeps, test::IncrementalFullDeps, test::Rustdoc, test::Pretty,
|
|
|
|
test::RunPassPretty, test::RunFailPretty, test::RunPassValgrindPretty,
|
|
|
|
test::RunPassFullDepsPretty, test::RunFailFullDepsPretty, test::RunMake,
|
|
|
|
test::Crate, test::CrateLibrustc, test::Rustdoc, test::Linkcheck, test::Cargotest,
|
2018-02-22 03:13:34 +08:00
|
|
|
test::Cargo, test::Rls, test::ErrorIndex, test::Distcheck,
|
|
|
|
test::Nomicon, test::Reference, test::RustdocBook, test::RustByExample,
|
|
|
|
test::TheBook, test::UnstableBook,
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
test::Rustfmt, test::Miri, test::Clippy, test::RustdocJS, test::RustdocTheme),
|
2018-01-15 10:44:00 -07:00
|
|
|
Kind::Bench => describe!(test::Crate, test::CrateLibrustc),
|
2017-07-19 06:55:46 -06:00
|
|
|
Kind::Doc => describe!(doc::UnstableBook, doc::UnstableBookGen, doc::TheBook,
|
|
|
|
doc::Standalone, doc::Std, doc::Test, doc::Rustc, doc::ErrorIndex, doc::Nomicon,
|
2017-12-01 18:29:12 -08:00
|
|
|
doc::Reference, doc::Rustdoc, doc::RustByExample, doc::CargoBook),
|
2017-07-19 06:55:46 -06:00
|
|
|
Kind::Dist => describe!(dist::Docs, dist::Mingw, dist::Rustc, dist::DebuggerScripts,
|
|
|
|
dist::Std, dist::Analysis, dist::Src, dist::PlainSourceTarball, dist::Cargo,
|
2018-02-10 18:18:41 -07:00
|
|
|
dist::Rls, dist::Rustfmt, dist::Extended, dist::HashSign),
|
2017-07-19 06:55:46 -06:00
|
|
|
Kind::Install => describe!(install::Docs, install::Std, install::Cargo, install::Rls,
|
2017-12-06 09:25:29 +01:00
|
|
|
install::Rustfmt, install::Analysis, install::Src, install::Rustc),
|
2017-07-19 06:55:46 -06:00
|
|
|
}
|
|
|
|
}
|
2017-07-05 10:20:20 -06:00
|
|
|
|
2017-07-18 18:03:38 -06:00
|
|
|
pub fn get_help(build: &Build, subcommand: &str) -> Option<String> {
|
|
|
|
let kind = match subcommand {
|
|
|
|
"build" => Kind::Build,
|
|
|
|
"doc" => Kind::Doc,
|
|
|
|
"test" => Kind::Test,
|
|
|
|
"bench" => Kind::Bench,
|
|
|
|
"dist" => Kind::Dist,
|
|
|
|
"install" => Kind::Install,
|
|
|
|
_ => return None,
|
|
|
|
};
|
|
|
|
|
|
|
|
let builder = Builder {
|
2017-08-06 22:54:09 -07:00
|
|
|
build,
|
2017-07-29 22:12:53 -06:00
|
|
|
top_stage: build.config.stage.unwrap_or(2),
|
2017-08-06 22:54:09 -07:00
|
|
|
kind,
|
2017-07-18 18:03:38 -06:00
|
|
|
cache: Cache::new(),
|
|
|
|
stack: RefCell::new(Vec::new()),
|
|
|
|
};
|
|
|
|
|
|
|
|
let builder = &builder;
|
|
|
|
let mut should_run = ShouldRun::new(builder);
|
2017-07-19 06:55:46 -06:00
|
|
|
for desc in Builder::get_step_descriptions(builder.kind) {
|
|
|
|
should_run = (desc.should_run)(should_run);
|
2017-07-18 18:03:38 -06:00
|
|
|
}
|
|
|
|
let mut help = String::from("Available paths:\n");
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
for pathset in should_run.paths {
|
|
|
|
for path in pathset.set {
|
|
|
|
help.push_str(format!(" ./x.py {} {}\n", subcommand, path.display()).as_str());
|
|
|
|
}
|
2017-07-18 18:03:38 -06:00
|
|
|
}
|
|
|
|
Some(help)
|
|
|
|
}
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
pub fn run(build: &Build) {
|
2017-07-29 22:12:53 -06:00
|
|
|
let (kind, paths) = match build.config.cmd {
|
2017-07-05 10:20:20 -06:00
|
|
|
Subcommand::Build { ref paths } => (Kind::Build, &paths[..]),
|
2018-01-15 10:44:00 -07:00
|
|
|
Subcommand::Check { ref paths } => (Kind::Check, &paths[..]),
|
2017-07-05 10:20:20 -06:00
|
|
|
Subcommand::Doc { ref paths } => (Kind::Doc, &paths[..]),
|
|
|
|
Subcommand::Test { ref paths, .. } => (Kind::Test, &paths[..]),
|
|
|
|
Subcommand::Bench { ref paths, .. } => (Kind::Bench, &paths[..]),
|
|
|
|
Subcommand::Dist { ref paths } => (Kind::Dist, &paths[..]),
|
|
|
|
Subcommand::Install { ref paths } => (Kind::Install, &paths[..]),
|
2017-12-06 09:25:29 +01:00
|
|
|
Subcommand::Clean { .. } => panic!(),
|
2017-07-05 10:20:20 -06:00
|
|
|
};
|
|
|
|
|
2018-02-16 14:27:45 +08:00
|
|
|
if let Some(path) = paths.get(0) {
|
|
|
|
if path == Path::new("nonexistent/path/to/trigger/cargo/metadata") {
|
|
|
|
return;
|
|
|
|
}
|
2018-02-15 18:12:04 -07:00
|
|
|
}
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
let builder = Builder {
|
2017-08-06 22:54:09 -07:00
|
|
|
build,
|
2017-07-29 22:12:53 -06:00
|
|
|
top_stage: build.config.stage.unwrap_or(2),
|
2017-08-06 22:54:09 -07:00
|
|
|
kind,
|
2017-07-05 10:20:20 -06:00
|
|
|
cache: Cache::new(),
|
|
|
|
stack: RefCell::new(Vec::new()),
|
|
|
|
};
|
|
|
|
|
2018-02-10 18:18:41 -07:00
|
|
|
if kind == Kind::Dist {
|
|
|
|
assert!(!build.config.test_miri, "Do not distribute with miri enabled.\n\
|
|
|
|
The distributed libraries would include all MIR (increasing binary size).
|
|
|
|
The distributed MIR would include validation statements.");
|
|
|
|
}
|
|
|
|
|
2017-07-19 06:55:46 -06:00
|
|
|
StepDescription::run(&Builder::get_step_descriptions(builder.kind), &builder, paths);
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn default_doc(&self, paths: Option<&[PathBuf]>) {
|
|
|
|
let paths = paths.unwrap_or(&[]);
|
2017-07-19 06:55:46 -06:00
|
|
|
StepDescription::run(&Builder::get_step_descriptions(Kind::Doc), self, paths);
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
|
2017-08-11 20:34:14 +02:00
|
|
|
/// Obtain a compiler at a given stage and for a given host. Explicitly does
|
2017-07-07 11:17:37 -06:00
|
|
|
/// not take `Compiler` since all `Compiler` instances are meant to be
|
|
|
|
/// obtained through this function, since it ensures that they are valid
|
|
|
|
/// (i.e., built and assembled).
|
2017-07-13 18:48:44 -06:00
|
|
|
pub fn compiler(&self, stage: u32, host: Interned<String>) -> Compiler {
|
2017-07-05 10:20:20 -06:00
|
|
|
self.ensure(compile::Assemble { target_compiler: Compiler { stage, host } })
|
|
|
|
}
|
|
|
|
|
2017-07-13 18:48:44 -06:00
|
|
|
pub fn sysroot(&self, compiler: Compiler) -> Interned<PathBuf> {
|
2017-07-05 10:20:20 -06:00
|
|
|
self.ensure(compile::Sysroot { compiler })
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the libdir where the standard library and other artifacts are
|
|
|
|
/// found for a compiler's sysroot.
|
2017-07-13 18:48:44 -06:00
|
|
|
pub fn sysroot_libdir(
|
|
|
|
&self, compiler: Compiler, target: Interned<String>
|
|
|
|
) -> Interned<PathBuf> {
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
|
|
|
|
struct Libdir {
|
|
|
|
compiler: Compiler,
|
|
|
|
target: Interned<String>,
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
2017-07-13 18:48:44 -06:00
|
|
|
impl Step for Libdir {
|
|
|
|
type Output = Interned<PathBuf>;
|
2017-07-14 06:30:16 -06:00
|
|
|
|
2017-07-18 18:03:38 -06:00
|
|
|
fn should_run(run: ShouldRun) -> ShouldRun {
|
|
|
|
run.never()
|
2017-07-14 06:30:16 -06:00
|
|
|
}
|
|
|
|
|
2017-07-13 18:48:44 -06:00
|
|
|
fn run(self, builder: &Builder) -> Interned<PathBuf> {
|
2017-07-12 09:15:00 -06:00
|
|
|
let compiler = self.compiler;
|
2018-02-19 16:08:36 -08:00
|
|
|
let config = &builder.build.config;
|
|
|
|
let lib = if compiler.stage >= 1 && config.libdir_relative().is_some() {
|
|
|
|
builder.build.config.libdir_relative().unwrap()
|
2017-07-07 23:00:38 -04:00
|
|
|
} else {
|
2018-02-19 16:08:36 -08:00
|
|
|
Path::new("lib")
|
2017-07-07 23:00:38 -04:00
|
|
|
};
|
|
|
|
let sysroot = builder.sysroot(self.compiler).join(lib)
|
|
|
|
.join("rustlib").join(self.target).join("lib");
|
2017-07-05 10:20:20 -06:00
|
|
|
let _ = fs::remove_dir_all(&sysroot);
|
|
|
|
t!(fs::create_dir_all(&sysroot));
|
2017-07-13 18:48:44 -06:00
|
|
|
INTERNER.intern_path(sysroot)
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
self.ensure(Libdir { compiler, target })
|
|
|
|
}
|
|
|
|
|
2018-01-30 15:40:44 -08:00
|
|
|
pub fn sysroot_codegen_backends(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
self.sysroot_libdir(compiler, compiler.host)
|
2018-03-02 09:19:50 +01:00
|
|
|
.with_file_name(self.build.config.rust_codegen_backends_dir.clone())
|
2018-01-30 15:40:44 -08:00
|
|
|
}
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
/// Returns the compiler's libdir where it stores the dynamic libraries that
|
|
|
|
/// it itself links against.
|
|
|
|
///
|
|
|
|
/// For example this returns `<sysroot>/lib` on Unix and `<sysroot>/bin` on
|
|
|
|
/// Windows.
|
|
|
|
pub fn rustc_libdir(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
if compiler.is_snapshot(self) {
|
|
|
|
self.build.rustc_snapshot_libdir()
|
|
|
|
} else {
|
2017-07-13 18:48:44 -06:00
|
|
|
self.sysroot(compiler).join(libdir(&compiler.host))
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Adds the compiler's directory of dynamic libraries to `cmd`'s dynamic
|
|
|
|
/// library lookup path.
|
|
|
|
pub fn add_rustc_lib_path(&self, compiler: Compiler, cmd: &mut Command) {
|
|
|
|
// Windows doesn't need dylib path munging because the dlls for the
|
|
|
|
// compiler live next to the compiler and the system will find them
|
|
|
|
// automatically.
|
|
|
|
if cfg!(windows) {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
add_lib_path(vec![self.rustc_libdir(compiler)], cmd);
|
|
|
|
}
|
|
|
|
|
2017-07-05 11:21:33 -06:00
|
|
|
/// Get a path to the compiler specified.
|
|
|
|
pub fn rustc(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
if compiler.is_snapshot(self) {
|
|
|
|
self.initial_rustc.clone()
|
|
|
|
} else {
|
2017-07-13 18:48:44 -06:00
|
|
|
self.sysroot(compiler).join("bin").join(exe("rustc", &compiler.host))
|
2017-07-05 11:21:33 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-04 16:13:01 -06:00
|
|
|
pub fn rustdoc(&self, host: Interned<String>) -> PathBuf {
|
|
|
|
self.ensure(tool::Rustdoc { host })
|
2017-07-22 20:01:58 -06:00
|
|
|
}
|
|
|
|
|
2017-08-04 16:13:01 -06:00
|
|
|
pub fn rustdoc_cmd(&self, host: Interned<String>) -> Command {
|
2017-07-22 20:01:58 -06:00
|
|
|
let mut cmd = Command::new(&self.out.join("bootstrap/debug/rustdoc"));
|
2017-08-04 16:13:01 -06:00
|
|
|
let compiler = self.compiler(self.top_stage, host);
|
2017-12-06 09:25:29 +01:00
|
|
|
cmd.env("RUSTC_STAGE", compiler.stage.to_string())
|
|
|
|
.env("RUSTC_SYSROOT", self.sysroot(compiler))
|
2018-01-12 10:04:02 +03:00
|
|
|
.env("RUSTDOC_LIBDIR", self.sysroot_libdir(compiler, self.build.build))
|
2017-12-06 09:25:29 +01:00
|
|
|
.env("CFG_RELEASE_CHANNEL", &self.build.config.channel)
|
|
|
|
.env("RUSTDOC_REAL", self.rustdoc(host))
|
2018-01-01 17:53:47 -08:00
|
|
|
.env("RUSTDOC_CRATE_VERSION", self.build.rust_version())
|
|
|
|
.env("RUSTC_BOOTSTRAP", "1");
|
2017-12-06 09:25:29 +01:00
|
|
|
if let Some(linker) = self.build.linker(host) {
|
|
|
|
cmd.env("RUSTC_TARGET_LINKER", linker);
|
|
|
|
}
|
2017-07-22 20:01:58 -06:00
|
|
|
cmd
|
2017-07-05 11:21:33 -06:00
|
|
|
}
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
/// Prepares an invocation of `cargo` to be run.
|
|
|
|
///
|
|
|
|
/// This will create a `Command` that represents a pending execution of
|
|
|
|
/// Cargo. This cargo will be configured to use `compiler` as the actual
|
|
|
|
/// rustc compiler, its output will be scoped by `mode`'s output directory,
|
|
|
|
/// it will pass the `--target` flag for the specified `target`, and will be
|
|
|
|
/// executing the Cargo command `cmd`.
|
2017-07-05 11:21:33 -06:00
|
|
|
pub fn cargo(&self,
|
2017-07-05 11:14:54 -06:00
|
|
|
compiler: Compiler,
|
|
|
|
mode: Mode,
|
2017-07-13 18:48:44 -06:00
|
|
|
target: Interned<String>,
|
2017-07-05 11:14:54 -06:00
|
|
|
cmd: &str) -> Command {
|
|
|
|
let mut cargo = Command::new(&self.initial_cargo);
|
|
|
|
let out_dir = self.stage_out(compiler, mode);
|
2017-07-05 10:20:20 -06:00
|
|
|
cargo.env("CARGO_TARGET_DIR", out_dir)
|
|
|
|
.arg(cmd)
|
2018-01-12 23:40:00 +01:00
|
|
|
.arg("--target")
|
|
|
|
.arg(target);
|
2017-07-05 10:20:20 -06:00
|
|
|
|
2017-09-15 09:40:35 -07:00
|
|
|
// If we were invoked from `make` then that's already got a jobserver
|
|
|
|
// set up for us so no need to tell Cargo about jobs all over again.
|
|
|
|
if env::var_os("MAKEFLAGS").is_none() && env::var_os("MFLAGS").is_none() {
|
|
|
|
cargo.arg("-j").arg(self.jobs().to_string());
|
|
|
|
}
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
// FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
|
|
|
|
// Force cargo to output binaries with disambiguating hashes in the name
|
2017-07-05 11:14:54 -06:00
|
|
|
cargo.env("__CARGO_DEFAULT_LIB_METADATA", &self.config.channel);
|
2017-07-05 10:20:20 -06:00
|
|
|
|
|
|
|
let stage;
|
2017-07-05 11:14:54 -06:00
|
|
|
if compiler.stage == 0 && self.local_rebuild {
|
2017-07-05 10:20:20 -06:00
|
|
|
// Assume the local-rebuild rustc already has stage1 features.
|
|
|
|
stage = 1;
|
|
|
|
} else {
|
|
|
|
stage = compiler.stage;
|
|
|
|
}
|
|
|
|
|
2018-01-28 17:09:47 -07:00
|
|
|
let mut extra_args = env::var(&format!("RUSTFLAGS_STAGE_{}", stage)).unwrap_or_default();
|
|
|
|
if stage != 0 {
|
|
|
|
let s = env::var("RUSTFLAGS_STAGE_NOT_0").unwrap_or_default();
|
|
|
|
extra_args.push_str(" ");
|
|
|
|
extra_args.push_str(&s);
|
|
|
|
}
|
|
|
|
|
|
|
|
if !extra_args.is_empty() {
|
|
|
|
cargo.env("RUSTFLAGS",
|
|
|
|
format!("{} {}", env::var("RUSTFLAGS").unwrap_or_default(), extra_args));
|
|
|
|
}
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
// Customize the compiler we're running. Specify the compiler to cargo
|
|
|
|
// as our shim and then pass it some various options used to configure
|
2017-07-05 11:14:54 -06:00
|
|
|
// how the actual compiler itself is called.
|
2017-07-05 10:20:20 -06:00
|
|
|
//
|
|
|
|
// These variables are primarily all read by
|
|
|
|
// src/bootstrap/bin/{rustc.rs,rustdoc.rs}
|
2017-07-05 11:14:54 -06:00
|
|
|
cargo.env("RUSTBUILD_NATIVE_DIR", self.native_dir(target))
|
|
|
|
.env("RUSTC", self.out.join("bootstrap/debug/rustc"))
|
2017-07-05 11:21:33 -06:00
|
|
|
.env("RUSTC_REAL", self.rustc(compiler))
|
2017-07-05 10:20:20 -06:00
|
|
|
.env("RUSTC_STAGE", stage.to_string())
|
|
|
|
.env("RUSTC_DEBUG_ASSERTIONS",
|
2017-07-05 11:14:54 -06:00
|
|
|
self.config.rust_debug_assertions.to_string())
|
2017-07-05 10:20:20 -06:00
|
|
|
.env("RUSTC_SYSROOT", self.sysroot(compiler))
|
|
|
|
.env("RUSTC_LIBDIR", self.rustc_libdir(compiler))
|
2017-07-05 11:14:54 -06:00
|
|
|
.env("RUSTC_RPATH", self.config.rust_rpath.to_string())
|
|
|
|
.env("RUSTDOC", self.out.join("bootstrap/debug/rustdoc"))
|
2017-07-22 20:01:58 -06:00
|
|
|
.env("RUSTDOC_REAL", if cmd == "doc" || cmd == "test" {
|
2017-08-04 16:13:01 -06:00
|
|
|
self.rustdoc(compiler.host)
|
2017-07-22 20:01:58 -06:00
|
|
|
} else {
|
|
|
|
PathBuf::from("/path/to/nowhere/rustdoc/not/required")
|
|
|
|
})
|
2018-01-02 16:21:35 -08:00
|
|
|
.env("TEST_MIRI", self.config.test_miri.to_string())
|
|
|
|
.env("RUSTC_ERROR_METADATA_DST", self.extended_error_dir());
|
2018-01-15 10:44:00 -07:00
|
|
|
|
2017-12-06 09:25:29 +01:00
|
|
|
if let Some(host_linker) = self.build.linker(compiler.host) {
|
|
|
|
cargo.env("RUSTC_HOST_LINKER", host_linker);
|
|
|
|
}
|
|
|
|
if let Some(target_linker) = self.build.linker(target) {
|
|
|
|
cargo.env("RUSTC_TARGET_LINKER", target_linker);
|
|
|
|
}
|
2018-02-24 15:56:33 -07:00
|
|
|
if let Some(ref error_format) = self.config.rustc_error_format {
|
|
|
|
cargo.env("RUSTC_ERROR_FORMAT", error_format);
|
|
|
|
}
|
2018-01-15 10:44:00 -07:00
|
|
|
if cmd != "build" && cmd != "check" {
|
2018-01-12 10:04:02 +03:00
|
|
|
cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(self.compiler(2, self.build.build)));
|
|
|
|
}
|
2017-07-05 10:20:20 -06:00
|
|
|
|
|
|
|
if mode != Mode::Tool {
|
2017-12-14 15:40:51 +01:00
|
|
|
// Tools don't get debuginfo right now, e.g. cargo and rls don't
|
|
|
|
// get compiled with debuginfo.
|
|
|
|
// Adding debuginfo increases their sizes by a factor of 3-4.
|
|
|
|
cargo.env("RUSTC_DEBUGINFO", self.config.rust_debuginfo.to_string());
|
|
|
|
cargo.env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string());
|
2017-12-06 09:25:29 +01:00
|
|
|
cargo.env("RUSTC_FORCE_UNSTABLE", "1");
|
2017-07-05 10:20:20 -06:00
|
|
|
|
|
|
|
// Currently the compiler depends on crates from crates.io, and
|
|
|
|
// then other crates can depend on the compiler (e.g. proc-macro
|
2017-07-05 11:14:54 -06:00
|
|
|
// crates). Let's say, for example that rustc itself depends on the
|
2017-07-05 10:20:20 -06:00
|
|
|
// bitflags crate. If an external crate then depends on the
|
|
|
|
// bitflags crate as well, we need to make sure they don't
|
2017-08-11 20:34:14 +02:00
|
|
|
// conflict, even if they pick the same version of bitflags. We'll
|
2017-07-05 10:20:20 -06:00
|
|
|
// want to make sure that e.g. a plugin and rustc each get their
|
|
|
|
// own copy of bitflags.
|
|
|
|
|
|
|
|
// Cargo ensures that this works in general through the -C metadata
|
|
|
|
// flag. This flag will frob the symbols in the binary to make sure
|
|
|
|
// they're different, even though the source code is the exact
|
|
|
|
// same. To solve this problem for the compiler we extend Cargo's
|
|
|
|
// already-passed -C metadata flag with our own. Our rustc.rs
|
|
|
|
// wrapper around the actual rustc will detect -C metadata being
|
|
|
|
// passed and frob it with this extra string we're passing in.
|
|
|
|
cargo.env("RUSTC_METADATA_SUFFIX", "rustc");
|
|
|
|
}
|
|
|
|
|
2017-08-22 16:24:29 -05:00
|
|
|
if let Some(x) = self.crt_static(target) {
|
|
|
|
cargo.env("RUSTC_CRT_STATIC", x.to_string());
|
|
|
|
}
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
// Enable usage of unstable features
|
|
|
|
cargo.env("RUSTC_BOOTSTRAP", "1");
|
2017-07-05 11:14:54 -06:00
|
|
|
self.add_rust_test_threads(&mut cargo);
|
2017-07-05 10:20:20 -06:00
|
|
|
|
|
|
|
// Almost all of the crates that we compile as part of the bootstrap may
|
|
|
|
// have a build script, including the standard library. To compile a
|
2017-07-05 11:14:54 -06:00
|
|
|
// build script, however, it itself needs a standard library! This
|
2017-07-05 10:20:20 -06:00
|
|
|
// introduces a bit of a pickle when we're compiling the standard
|
2017-07-05 11:14:54 -06:00
|
|
|
// library itself.
|
2017-07-05 10:20:20 -06:00
|
|
|
//
|
|
|
|
// To work around this we actually end up using the snapshot compiler
|
2017-07-05 11:14:54 -06:00
|
|
|
// (stage0) for compiling build scripts of the standard library itself.
|
2017-07-05 10:20:20 -06:00
|
|
|
// The stage0 compiler is guaranteed to have a libstd available for use.
|
|
|
|
//
|
|
|
|
// For other crates, however, we know that we've already got a standard
|
|
|
|
// library up and running, so we can use the normal compiler to compile
|
|
|
|
// build scripts in that situation.
|
2017-09-18 17:37:57 +02:00
|
|
|
//
|
|
|
|
// If LLVM support is disabled we need to use the snapshot compiler to compile
|
2018-02-10 12:22:57 +01:00
|
|
|
// build scripts, as the new compiler doesn't support executables.
|
2017-08-26 17:31:32 +02:00
|
|
|
if mode == Mode::Libstd || !self.build.config.llvm_enabled {
|
2017-07-05 11:14:54 -06:00
|
|
|
cargo.env("RUSTC_SNAPSHOT", &self.initial_rustc)
|
|
|
|
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_snapshot_libdir());
|
2017-07-05 10:20:20 -06:00
|
|
|
} else {
|
2017-07-05 11:21:33 -06:00
|
|
|
cargo.env("RUSTC_SNAPSHOT", self.rustc(compiler))
|
2017-07-05 10:20:20 -06:00
|
|
|
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_libdir(compiler));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Ignore incremental modes except for stage0, since we're
|
|
|
|
// not guaranteeing correctness across builds if the compiler
|
|
|
|
// is changing under your feet.`
|
2017-07-29 22:12:53 -06:00
|
|
|
if self.config.incremental && compiler.stage == 0 {
|
2018-01-15 10:44:00 -07:00
|
|
|
cargo.env("CARGO_INCREMENTAL", "1");
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
|
2017-07-29 22:12:53 -06:00
|
|
|
if let Some(ref on_fail) = self.config.on_fail {
|
2017-07-05 10:20:20 -06:00
|
|
|
cargo.env("RUSTC_ON_FAIL", on_fail);
|
|
|
|
}
|
|
|
|
|
2017-07-05 11:14:54 -06:00
|
|
|
cargo.env("RUSTC_VERBOSE", format!("{}", self.verbosity));
|
2017-07-05 10:20:20 -06:00
|
|
|
|
2017-12-06 09:25:29 +01:00
|
|
|
// Throughout the build Cargo can execute a number of build scripts
|
|
|
|
// compiling C/C++ code and we need to pass compilers, archivers, flags, etc
|
|
|
|
// obtained previously to those build scripts.
|
|
|
|
// Build scripts use either the `cc` crate or `configure/make` so we pass
|
|
|
|
// the options through environment variables that are fetched and understood by both.
|
2017-07-05 10:20:20 -06:00
|
|
|
//
|
|
|
|
// FIXME: the guard against msvc shouldn't need to be here
|
|
|
|
if !target.contains("msvc") {
|
2018-02-14 07:44:53 -08:00
|
|
|
let cc = self.cc(target);
|
|
|
|
cargo.env(format!("CC_{}", target), cc)
|
|
|
|
.env("CC", cc);
|
2017-12-06 09:25:29 +01:00
|
|
|
|
|
|
|
let cflags = self.cflags(target).join(" ");
|
|
|
|
cargo.env(format!("CFLAGS_{}", target), cflags.clone())
|
|
|
|
.env("CFLAGS", cflags.clone());
|
|
|
|
|
|
|
|
if let Some(ar) = self.ar(target) {
|
|
|
|
let ranlib = format!("{} s", ar.display());
|
|
|
|
cargo.env(format!("AR_{}", target), ar)
|
|
|
|
.env("AR", ar)
|
|
|
|
.env(format!("RANLIB_{}", target), ranlib.clone())
|
|
|
|
.env("RANLIB", ranlib);
|
|
|
|
}
|
2017-07-05 10:20:20 -06:00
|
|
|
|
2017-07-05 11:14:54 -06:00
|
|
|
if let Ok(cxx) = self.cxx(target) {
|
2018-02-14 07:44:53 -08:00
|
|
|
cargo.env(format!("CXX_{}", target), cxx)
|
|
|
|
.env("CXX", cxx)
|
2017-12-06 09:25:29 +01:00
|
|
|
.env(format!("CXXFLAGS_{}", target), cflags.clone())
|
|
|
|
.env("CXXFLAGS", cflags);
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-05 11:14:54 -06:00
|
|
|
if mode == Mode::Libstd && self.config.extended && compiler.is_final_stage(self) {
|
2017-07-05 10:20:20 -06:00
|
|
|
cargo.env("RUSTC_SAVE_ANALYSIS", "api".to_string());
|
|
|
|
}
|
|
|
|
|
2017-12-06 09:25:29 +01:00
|
|
|
// For `cargo doc` invocations, make rustdoc print the Rust version into the docs
|
|
|
|
cargo.env("RUSTDOC_CRATE_VERSION", self.build.rust_version());
|
|
|
|
|
2017-07-05 10:20:20 -06:00
|
|
|
// Environment variables *required* throughout the build
|
|
|
|
//
|
|
|
|
// FIXME: should update code to not require this env var
|
|
|
|
cargo.env("CFG_COMPILER_HOST_TRIPLE", target);
|
|
|
|
|
2017-07-25 17:59:31 -06:00
|
|
|
// Set this for all builds to make sure doc builds also get it.
|
|
|
|
cargo.env("CFG_RELEASE_CHANNEL", &self.build.config.channel);
|
|
|
|
|
2018-01-08 13:56:22 -08:00
|
|
|
// This one's a bit tricky. As of the time of this writing the compiler
|
|
|
|
// links to the `winapi` crate on crates.io. This crate provides raw
|
|
|
|
// bindings to Windows system functions, sort of like libc does for
|
|
|
|
// Unix. This crate also, however, provides "import libraries" for the
|
|
|
|
// MinGW targets. There's an import library per dll in the windows
|
|
|
|
// distribution which is what's linked to. These custom import libraries
|
|
|
|
// are used because the winapi crate can reference Windows functions not
|
|
|
|
// present in the MinGW import libraries.
|
|
|
|
//
|
|
|
|
// For example MinGW may ship libdbghelp.a, but it may not have
|
|
|
|
// references to all the functions in the dbghelp dll. Instead the
|
|
|
|
// custom import library for dbghelp in the winapi crates has all this
|
|
|
|
// information.
|
|
|
|
//
|
|
|
|
// Unfortunately for us though the import libraries are linked by
|
|
|
|
// default via `-ldylib=winapi_foo`. That is, they're linked with the
|
|
|
|
// `dylib` type with a `winapi_` prefix (so the winapi ones don't
|
|
|
|
// conflict with the system MinGW ones). This consequently means that
|
|
|
|
// the binaries we ship of things like rustc_trans (aka the rustc_trans
|
|
|
|
// DLL) when linked against *again*, for example with procedural macros
|
|
|
|
// or plugins, will trigger the propagation logic of `-ldylib`, passing
|
|
|
|
// `-lwinapi_foo` to the linker again. This isn't actually available in
|
|
|
|
// our distribution, however, so the link fails.
|
|
|
|
//
|
|
|
|
// To solve this problem we tell winapi to not use its bundled import
|
|
|
|
// libraries. This means that it will link to the system MinGW import
|
|
|
|
// libraries by default, and the `-ldylib=foo` directives will still get
|
|
|
|
// passed to the final linker, but they'll look like `-lfoo` which can
|
|
|
|
// be resolved because MinGW has the import library. The downside is we
|
|
|
|
// don't get newer functions from Windows, but we don't use any of them
|
|
|
|
// anyway.
|
|
|
|
cargo.env("WINAPI_NO_BUNDLED_LIBRARIES", "1");
|
|
|
|
|
2017-12-06 09:25:29 +01:00
|
|
|
if self.is_very_verbose() {
|
2017-07-05 10:20:20 -06:00
|
|
|
cargo.arg("-v");
|
|
|
|
}
|
2018-01-28 15:50:03 -07:00
|
|
|
|
|
|
|
// This must be kept before the thinlto check, as we set codegen units
|
|
|
|
// to 1 forcibly there.
|
|
|
|
if let Some(n) = self.config.rust_codegen_units {
|
|
|
|
cargo.env("RUSTC_CODEGEN_UNITS", n.to_string());
|
|
|
|
}
|
|
|
|
|
2017-12-06 09:25:29 +01:00
|
|
|
if self.config.rust_optimize {
|
|
|
|
// FIXME: cargo bench does not accept `--release`
|
|
|
|
if cmd != "bench" {
|
|
|
|
cargo.arg("--release");
|
|
|
|
}
|
|
|
|
|
|
|
|
if self.config.rust_codegen_units.is_none() &&
|
2018-01-28 15:50:03 -07:00
|
|
|
self.build.is_rust_llvm(compiler.host) &&
|
|
|
|
self.config.rust_thinlto {
|
2017-12-06 09:25:29 +01:00
|
|
|
cargo.env("RUSTC_THINLTO", "1");
|
2018-01-28 15:50:03 -07:00
|
|
|
} else if self.config.rust_codegen_units.is_none() {
|
|
|
|
// Generally, if ThinLTO has been disabled for some reason, we
|
|
|
|
// want to set the codegen units to 1. However, we shouldn't do
|
|
|
|
// this if the option was specifically set by the user.
|
|
|
|
cargo.env("RUSTC_CODEGEN_UNITS", "1");
|
2017-12-06 09:25:29 +01:00
|
|
|
}
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
2018-01-28 15:50:03 -07:00
|
|
|
|
2017-07-05 11:14:54 -06:00
|
|
|
if self.config.locked_deps {
|
2017-07-05 10:20:20 -06:00
|
|
|
cargo.arg("--locked");
|
|
|
|
}
|
2017-07-05 11:14:54 -06:00
|
|
|
if self.config.vendor || self.is_sudo {
|
2017-07-05 10:20:20 -06:00
|
|
|
cargo.arg("--frozen");
|
|
|
|
}
|
|
|
|
|
2017-07-05 11:14:54 -06:00
|
|
|
self.ci_env.force_coloring_in_ci(&mut cargo);
|
2017-07-05 10:20:20 -06:00
|
|
|
|
|
|
|
cargo
|
|
|
|
}
|
|
|
|
|
2017-07-07 11:17:37 -06:00
|
|
|
/// Ensure that a given step is built, returning it's output. This will
|
|
|
|
/// cache the step, so it is safe (and good!) to call this as often as
|
|
|
|
/// needed to ensure that all dependencies are built.
|
2017-07-13 18:48:44 -06:00
|
|
|
pub fn ensure<S: Step>(&'a self, step: S) -> S::Output {
|
2017-07-05 10:20:20 -06:00
|
|
|
{
|
|
|
|
let mut stack = self.stack.borrow_mut();
|
2017-07-17 18:01:48 -06:00
|
|
|
for stack_step in stack.iter() {
|
|
|
|
// should skip
|
|
|
|
if stack_step.downcast_ref::<S>().map_or(true, |stack_step| *stack_step != step) {
|
|
|
|
continue;
|
2017-07-13 18:48:44 -06:00
|
|
|
}
|
2017-07-05 10:20:20 -06:00
|
|
|
let mut out = String::new();
|
2017-07-13 18:48:44 -06:00
|
|
|
out += &format!("\n\nCycle in build detected when adding {:?}\n", step);
|
2017-07-05 10:20:20 -06:00
|
|
|
for el in stack.iter().rev() {
|
|
|
|
out += &format!("\t{:?}\n", el);
|
|
|
|
}
|
|
|
|
panic!(out);
|
|
|
|
}
|
2017-07-13 18:48:44 -06:00
|
|
|
if let Some(out) = self.cache.get(&step) {
|
|
|
|
self.build.verbose(&format!("{}c {:?}", " ".repeat(stack.len()), step));
|
2017-07-05 10:20:20 -06:00
|
|
|
|
|
|
|
return out;
|
|
|
|
}
|
2017-07-13 18:48:44 -06:00
|
|
|
self.build.verbose(&format!("{}> {:?}", " ".repeat(stack.len()), step));
|
2017-07-17 18:01:48 -06:00
|
|
|
stack.push(Box::new(step.clone()));
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
2017-07-13 18:48:44 -06:00
|
|
|
let out = step.clone().run(self);
|
2017-07-05 10:20:20 -06:00
|
|
|
{
|
|
|
|
let mut stack = self.stack.borrow_mut();
|
2017-07-17 18:01:48 -06:00
|
|
|
let cur_step = stack.pop().expect("step stack empty");
|
|
|
|
assert_eq!(cur_step.downcast_ref(), Some(&step));
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
2017-07-13 18:48:44 -06:00
|
|
|
self.build.verbose(&format!("{}< {:?}", " ".repeat(self.stack.borrow().len()), step));
|
|
|
|
self.cache.put(step, out.clone());
|
|
|
|
out
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
}
|