2017-09-15 16:40:35 +00:00
|
|
|
use std::any::Any;
|
2018-03-16 19:10:47 +00:00
|
|
|
use std::cell::{Cell, RefCell};
|
2017-09-15 16:40:35 +00:00
|
|
|
use std::collections::BTreeSet;
|
2018-05-30 17:33:43 +00:00
|
|
|
use std::collections::HashMap;
|
2017-09-15 16:40:35 +00:00
|
|
|
use std::env;
|
2017-07-14 00:48:44 +00:00
|
|
|
use std::fmt::Debug;
|
2017-09-15 16:40:35 +00:00
|
|
|
use std::fs;
|
2017-07-14 00:48:44 +00:00
|
|
|
use std::hash::Hash;
|
2017-09-15 16:40:35 +00:00
|
|
|
use std::ops::Deref;
|
2017-07-05 16:20:20 +00:00
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use std::process::Command;
|
2018-05-30 17:33:43 +00:00
|
|
|
use std::time::{Duration, Instant};
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2019-05-09 16:03:13 +00:00
|
|
|
use build_helper::t;
|
|
|
|
|
2018-12-07 12:21:05 +00:00
|
|
|
use crate::cache::{Cache, Interned, INTERNER};
|
|
|
|
use crate::check;
|
|
|
|
use crate::compile;
|
|
|
|
use crate::dist;
|
|
|
|
use crate::doc;
|
|
|
|
use crate::flags::Subcommand;
|
|
|
|
use crate::install;
|
|
|
|
use crate::native;
|
|
|
|
use crate::test;
|
|
|
|
use crate::tool;
|
2019-01-22 00:47:57 +00:00
|
|
|
use crate::util::{self, add_lib_path, exe, libdir};
|
2018-12-07 12:21:05 +00:00
|
|
|
use crate::{Build, DocTests, Mode, GitRepo};
|
|
|
|
|
|
|
|
pub use crate::Compiler;
|
2017-07-05 16:46:41 +00:00
|
|
|
|
2018-03-27 10:44:33 +00:00
|
|
|
use petgraph::graph::NodeIndex;
|
2018-05-30 17:33:43 +00:00
|
|
|
use petgraph::Graph;
|
2018-03-27 10:44:33 +00:00
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
pub struct Builder<'a> {
|
|
|
|
pub build: &'a Build,
|
|
|
|
pub top_stage: u32,
|
|
|
|
pub kind: Kind,
|
|
|
|
cache: Cache,
|
2018-07-10 16:10:05 +00:00
|
|
|
stack: RefCell<Vec<Box<dyn Any>>>,
|
2018-03-16 19:10:47 +00:00
|
|
|
time_spent_on_dependencies: Cell<Duration>,
|
2018-03-10 02:05:06 +00:00
|
|
|
pub paths: Vec<PathBuf>,
|
2018-03-27 10:44:33 +00:00
|
|
|
graph_nodes: RefCell<HashMap<String, NodeIndex>>,
|
|
|
|
graph: RefCell<Graph<String, bool>>,
|
|
|
|
parent: Cell<Option<NodeIndex>>,
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Deref for Builder<'a> {
|
|
|
|
type Target = Build;
|
|
|
|
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
|
|
self.build
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-14 00:48:44 +00:00
|
|
|
pub trait Step: 'static + Clone + Debug + PartialEq + Eq + Hash {
|
2017-07-07 17:17:37 +00:00
|
|
|
/// `PathBuf` when directories are created or to return a `Compiler` once
|
|
|
|
/// it's been assembled.
|
2017-07-14 00:48:44 +00:00
|
|
|
type Output: Clone;
|
2017-07-13 17:12:57 +00:00
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
const DEFAULT: bool = false;
|
|
|
|
|
2019-06-07 14:38:29 +00:00
|
|
|
/// If true, then this rule should be skipped if --target was specified, but --host was not
|
2017-07-05 16:20:20 +00:00
|
|
|
const ONLY_HOSTS: bool = false;
|
|
|
|
|
2019-02-08 13:53:55 +00:00
|
|
|
/// Primary function to execute this rule. Can call `builder.ensure()`
|
2017-07-07 17:17:37 +00:00
|
|
|
/// with other steps to run those.
|
2019-02-25 10:30:32 +00:00
|
|
|
fn run(self, builder: &Builder<'_>) -> Self::Output;
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2017-07-07 17:17:37 +00: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
|
2019-02-08 13:53:55 +00:00
|
|
|
/// when we are not passed any paths; in that case, `make_run` is called
|
2017-07-07 17:17:37 +00:00
|
|
|
/// directly.
|
2019-02-25 10:30:32 +00:00
|
|
|
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_>;
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2019-02-08 13:53:55 +00:00
|
|
|
/// Builds up a "root" rule, either as a default rule or from a path passed
|
2017-07-07 17:17:37 +00:00
|
|
|
/// 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`.
|
2019-02-25 10:30:32 +00:00
|
|
|
fn make_run(_run: RunConfig<'_>) {
|
2017-07-14 12:30:16 +00: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 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2017-07-20 23:51:07 +00:00
|
|
|
pub struct RunConfig<'a> {
|
|
|
|
pub builder: &'a Builder<'a>,
|
|
|
|
pub host: Interned<String>,
|
|
|
|
pub target: Interned<String>,
|
2018-02-14 01:42:26 +00:00
|
|
|
pub path: PathBuf,
|
2017-07-20 23:51:07 +00:00
|
|
|
}
|
|
|
|
|
2017-07-19 12:55:46 +00:00
|
|
|
struct StepDescription {
|
|
|
|
default: bool,
|
|
|
|
only_hosts: bool,
|
2019-02-25 10:30:32 +00:00
|
|
|
should_run: fn(ShouldRun<'_>) -> ShouldRun<'_>,
|
|
|
|
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 16:51:58 +00:00
|
|
|
name: &'static str,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq)]
|
2018-04-12 11:49:31 +00:00
|
|
|
pub enum PathSet {
|
2018-05-30 17:33:43 +00:00
|
|
|
Set(BTreeSet<PathBuf>),
|
|
|
|
Suite(PathBuf),
|
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 16:51:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl PathSet {
|
2018-02-14 01:42:26 +00:00
|
|
|
fn empty() -> PathSet {
|
2018-04-12 11:49:31 +00:00
|
|
|
PathSet::Set(BTreeSet::new())
|
2018-02-14 01:42:26 +00: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 16:51:58 +00:00
|
|
|
fn one<P: Into<PathBuf>>(path: P) -> PathSet {
|
|
|
|
let mut set = BTreeSet::new();
|
|
|
|
set.insert(path.into());
|
2018-04-12 11:49:31 +00:00
|
|
|
PathSet::Set(set)
|
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 16:51:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn has(&self, needle: &Path) -> bool {
|
2018-04-12 11:49:31 +00:00
|
|
|
match self {
|
|
|
|
PathSet::Set(set) => set.iter().any(|p| p.ends_with(needle)),
|
2018-11-03 18:32:53 +00:00
|
|
|
PathSet::Suite(suite) => suite.ends_with(needle),
|
2018-04-12 11:49:31 +00: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 16:51:58 +00:00
|
|
|
}
|
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
fn path(&self, builder: &Builder<'_>) -> PathBuf {
|
2018-04-12 11:49:31 +00:00
|
|
|
match self {
|
2018-05-30 17:33:43 +00:00
|
|
|
PathSet::Set(set) => set
|
|
|
|
.iter()
|
|
|
|
.next()
|
|
|
|
.unwrap_or(&builder.build.src)
|
|
|
|
.to_path_buf(),
|
|
|
|
PathSet::Suite(path) => PathBuf::from(path),
|
2018-04-12 11:49:31 +00: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 16:51:58 +00:00
|
|
|
}
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl StepDescription {
|
|
|
|
fn from<S: Step>() -> StepDescription {
|
|
|
|
StepDescription {
|
|
|
|
default: S::DEFAULT,
|
|
|
|
only_hosts: S::ONLY_HOSTS,
|
|
|
|
should_run: S::should_run,
|
|
|
|
make_run: S::make_run,
|
2019-08-11 16:55:14 +00:00
|
|
|
name: std::any::type_name::<S>(),
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
fn maybe_run(&self, builder: &Builder<'_>, pathset: &PathSet) {
|
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 16:51:58 +00:00
|
|
|
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() {
|
2018-05-30 17:33:43 +00:00
|
|
|
eprintln!(
|
|
|
|
"{:?} not skipped for {:?} -- not in {:?}",
|
|
|
|
pathset, self.name, builder.config.exclude
|
|
|
|
);
|
2018-02-09 20:40:23 +00:00
|
|
|
}
|
2018-04-14 23:27:57 +00:00
|
|
|
let hosts = &builder.hosts;
|
2017-07-19 12:55:46 +00:00
|
|
|
|
2017-07-30 04:12:53 +00:00
|
|
|
// Determine the targets participating in this rule.
|
2017-07-19 12:55:46 +00:00
|
|
|
let targets = if self.only_hosts {
|
2019-06-07 14:38:29 +00:00
|
|
|
if builder.config.skip_only_host_steps {
|
2018-02-11 22:42:05 +00:00
|
|
|
return; // don't run anything
|
2017-07-19 12:55:46 +00:00
|
|
|
} else {
|
2018-04-14 23:27:57 +00:00
|
|
|
&builder.hosts
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
} else {
|
2018-04-14 23:27:57 +00:00
|
|
|
&builder.targets
|
2017-07-19 12:55:46 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
for host in hosts {
|
|
|
|
for target in targets {
|
2017-07-20 23:51:07 +00:00
|
|
|
let run = RunConfig {
|
|
|
|
builder,
|
2018-02-14 01:42:26 +00:00
|
|
|
path: pathset.path(builder),
|
2017-07-20 23:51:07 +00:00
|
|
|
host: *host,
|
|
|
|
target: *target,
|
|
|
|
};
|
|
|
|
(self.make_run)(run);
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
fn run(v: &[StepDescription], builder: &Builder<'_>, paths: &[PathBuf]) {
|
2018-05-30 17:33:43 +00: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 16:51:58 +00:00
|
|
|
|
|
|
|
// sanity checks on rules
|
|
|
|
for (desc, should_run) in v.iter().zip(&should_runs) {
|
2018-05-30 17:33:43 +00:00
|
|
|
assert!(
|
|
|
|
!should_run.paths.is_empty(),
|
|
|
|
"{:?} should have at least one pathset",
|
|
|
|
desc.name
|
|
|
|
);
|
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 16:51:58 +00:00
|
|
|
}
|
|
|
|
|
2017-07-19 12:55:46 +00:00
|
|
|
if paths.is_empty() {
|
2017-07-20 23:24:11 +00: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 16:51:58 +00:00
|
|
|
for pathset in &should_run.paths {
|
|
|
|
desc.maybe_run(builder, pathset);
|
|
|
|
}
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for path in paths {
|
2018-06-21 22:48:24 +00:00
|
|
|
// strip CurDir prefix if present
|
|
|
|
let path = match path.strip_prefix(".") {
|
|
|
|
Ok(p) => p,
|
|
|
|
Err(_) => path,
|
|
|
|
};
|
|
|
|
|
2017-07-19 12:55:46 +00:00
|
|
|
let mut attempted_run = false;
|
2017-07-20 23:24:11 +00:00
|
|
|
for (desc, should_run) in v.iter().zip(&should_runs) {
|
2018-04-12 11:49:31 +00:00
|
|
|
if let Some(suite) = should_run.is_suite_path(path) {
|
|
|
|
attempted_run = true;
|
|
|
|
desc.maybe_run(builder, suite);
|
|
|
|
} else if let Some(pathset) = should_run.pathset_for_path(path) {
|
2017-07-19 12:55:46 +00: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 16:51:58 +00:00
|
|
|
desc.maybe_run(builder, pathset);
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !attempted_run {
|
2018-02-16 01:01:26 +00:00
|
|
|
panic!("Error: no rules matched {}.", path.display());
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-19 00:03:38 +00:00
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct ShouldRun<'a> {
|
2017-07-20 23:24:11 +00:00
|
|
|
pub builder: &'a Builder<'a>,
|
2017-07-19 00:03:38 +00: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 16:51:58 +00:00
|
|
|
paths: BTreeSet<PathSet>,
|
2017-07-20 23:24:11 +00:00
|
|
|
|
|
|
|
// If this is a default rule, this is an additional constraint placed on
|
2018-02-21 19:13:34 +00:00
|
|
|
// its run. Generally something like compiler docs being enabled.
|
2017-07-20 23:24:11 +00:00
|
|
|
is_really_default: bool,
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> ShouldRun<'a> {
|
2019-02-25 10:30:32 +00:00
|
|
|
fn new(builder: &'a Builder<'_>) -> ShouldRun<'a> {
|
2017-07-19 00:03:38 +00:00
|
|
|
ShouldRun {
|
2017-08-07 05:54:09 +00:00
|
|
|
builder,
|
2017-07-19 00:03:38 +00:00
|
|
|
paths: BTreeSet::new(),
|
2017-07-20 23:24:11 +00:00
|
|
|
is_really_default: true, // by default no additional conditions
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-20 23:24:11 +00: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 16:51:58 +00: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));
|
|
|
|
}
|
2018-04-12 11:49:31 +00:00
|
|
|
self.paths.insert(PathSet::Set(set));
|
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 16:51:58 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2017-07-19 00:03:38 +00: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 16:51:58 +00:00
|
|
|
for krate in self.builder.in_tree_crates(name) {
|
|
|
|
self.paths.insert(PathSet::one(&krate.path));
|
2017-07-19 00:03:38 +00: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 16:51:58 +00: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 {
|
2018-05-30 17:33:43 +00:00
|
|
|
self.paths
|
|
|
|
.insert(PathSet::Set(paths.iter().map(PathBuf::from).collect()));
|
2018-04-12 11:49:31 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn is_suite_path(&self, path: &Path) -> Option<&PathSet> {
|
2018-05-30 17:33:43 +00:00
|
|
|
self.paths.iter().find(|pathset| match pathset {
|
|
|
|
PathSet::Suite(p) => path.starts_with(p),
|
|
|
|
PathSet::Set(_) => false,
|
2018-04-12 11:49:31 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn suite_path(mut self, suite: &str) -> Self {
|
|
|
|
self.paths.insert(PathSet::Suite(PathBuf::from(suite)));
|
2017-07-19 00:03:38 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
// allows being more explicit about why should_run in Step returns the value passed to it
|
2018-02-14 01:42:26 +00:00
|
|
|
pub fn never(mut self) -> ShouldRun<'a> {
|
|
|
|
self.paths.insert(PathSet::empty());
|
2017-07-19 00:03:38 +00: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 16:51:58 +00:00
|
|
|
fn pathset_for_path(&self, path: &Path) -> Option<&PathSet> {
|
|
|
|
self.paths.iter().find(|pathset| pathset.has(path))
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
|
|
|
|
pub enum Kind {
|
|
|
|
Build,
|
2018-01-15 17:44:00 +00:00
|
|
|
Check,
|
2018-12-04 18:26:54 +00:00
|
|
|
Clippy,
|
|
|
|
Fix,
|
2017-07-05 16:20:20 +00:00
|
|
|
Test,
|
|
|
|
Bench,
|
|
|
|
Dist,
|
|
|
|
Doc,
|
|
|
|
Install,
|
|
|
|
}
|
|
|
|
|
2017-07-19 12:55:46 +00:00
|
|
|
impl<'a> Builder<'a> {
|
|
|
|
fn get_step_descriptions(kind: Kind) -> Vec<StepDescription> {
|
|
|
|
macro_rules! describe {
|
2019-02-24 12:59:44 +00:00
|
|
|
($($rule:ty),+ $(,)?) => {{
|
2017-07-19 12:55:46 +00:00
|
|
|
vec![$(StepDescription::from::<$rule>()),+]
|
|
|
|
}};
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2017-07-19 12:55:46 +00:00
|
|
|
match kind {
|
2018-05-30 17:33:43 +00:00
|
|
|
Kind::Build => describe!(
|
|
|
|
compile::Std,
|
|
|
|
compile::Rustc,
|
2018-06-09 17:27:24 +00:00
|
|
|
compile::CodegenBackend,
|
2018-05-30 17:33:43 +00:00
|
|
|
compile::StartupObjects,
|
|
|
|
tool::BuildManifest,
|
|
|
|
tool::Rustbook,
|
|
|
|
tool::ErrorIndex,
|
|
|
|
tool::UnstableBookGen,
|
|
|
|
tool::Tidy,
|
|
|
|
tool::Linkchecker,
|
|
|
|
tool::CargoTest,
|
|
|
|
tool::Compiletest,
|
|
|
|
tool::RemoteTestServer,
|
|
|
|
tool::RemoteTestClient,
|
|
|
|
tool::RustInstaller,
|
|
|
|
tool::Cargo,
|
|
|
|
tool::Rls,
|
|
|
|
tool::Rustdoc,
|
|
|
|
tool::Clippy,
|
|
|
|
native::Llvm,
|
|
|
|
tool::Rustfmt,
|
|
|
|
tool::Miri,
|
|
|
|
native::Lld
|
|
|
|
),
|
2018-12-04 18:26:54 +00:00
|
|
|
Kind::Check | Kind::Clippy | Kind::Fix => describe!(
|
2018-05-30 17:33:43 +00:00
|
|
|
check::Std,
|
|
|
|
check::Rustc,
|
|
|
|
check::CodegenBackend,
|
|
|
|
check::Rustdoc
|
|
|
|
),
|
|
|
|
Kind::Test => describe!(
|
|
|
|
test::Tidy,
|
|
|
|
test::Ui,
|
|
|
|
test::CompileFail,
|
|
|
|
test::RunFail,
|
|
|
|
test::RunPassValgrind,
|
|
|
|
test::MirOpt,
|
|
|
|
test::Codegen,
|
|
|
|
test::CodegenUnits,
|
2019-03-16 22:40:43 +00:00
|
|
|
test::Assembly,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::Incremental,
|
|
|
|
test::Debuginfo,
|
|
|
|
test::UiFullDeps,
|
|
|
|
test::Rustdoc,
|
|
|
|
test::Pretty,
|
|
|
|
test::RunFailPretty,
|
|
|
|
test::RunPassValgrindPretty,
|
|
|
|
test::Crate,
|
|
|
|
test::CrateLibrustc,
|
|
|
|
test::CrateRustdoc,
|
|
|
|
test::Linkcheck,
|
|
|
|
test::Cargotest,
|
|
|
|
test::Cargo,
|
|
|
|
test::Rls,
|
|
|
|
test::ErrorIndex,
|
|
|
|
test::Distcheck,
|
2018-03-09 17:26:15 +00:00
|
|
|
test::RunMakeFullDeps,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::Nomicon,
|
|
|
|
test::Reference,
|
|
|
|
test::RustdocBook,
|
|
|
|
test::RustByExample,
|
|
|
|
test::TheBook,
|
|
|
|
test::UnstableBook,
|
|
|
|
test::RustcBook,
|
2019-04-04 16:05:22 +00:00
|
|
|
test::RustcGuide,
|
2019-02-10 02:42:23 +00:00
|
|
|
test::EmbeddedBook,
|
2019-03-22 15:52:45 +00:00
|
|
|
test::EditionGuide,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::Rustfmt,
|
|
|
|
test::Miri,
|
|
|
|
test::Clippy,
|
2018-12-13 20:57:23 +00:00
|
|
|
test::CompiletestTest,
|
2019-02-23 23:08:43 +00:00
|
|
|
test::RustdocJSStd,
|
2019-02-09 19:28:22 +00:00
|
|
|
test::RustdocJSNotStd,
|
2018-05-30 17:33:43 +00:00
|
|
|
test::RustdocTheme,
|
2019-03-14 05:35:48 +00:00
|
|
|
test::RustdocUi,
|
2018-06-16 17:11:06 +00:00
|
|
|
// Run bootstrap close to the end as it's unlikely to fail
|
|
|
|
test::Bootstrap,
|
2018-03-20 14:33:22 +00:00
|
|
|
// Run run-make last, since these won't pass without make on Windows
|
2018-05-30 17:33:43 +00:00
|
|
|
test::RunMake,
|
|
|
|
),
|
2018-01-15 17:44:00 +00:00
|
|
|
Kind::Bench => describe!(test::Crate, test::CrateLibrustc),
|
2018-05-30 17:33:43 +00:00
|
|
|
Kind::Doc => describe!(
|
|
|
|
doc::UnstableBook,
|
|
|
|
doc::UnstableBookGen,
|
|
|
|
doc::TheBook,
|
|
|
|
doc::Standalone,
|
|
|
|
doc::Std,
|
|
|
|
doc::Rustc,
|
|
|
|
doc::Rustdoc,
|
|
|
|
doc::ErrorIndex,
|
|
|
|
doc::Nomicon,
|
|
|
|
doc::Reference,
|
|
|
|
doc::RustdocBook,
|
|
|
|
doc::RustByExample,
|
|
|
|
doc::RustcBook,
|
2018-12-04 21:47:46 +00:00
|
|
|
doc::CargoBook,
|
2019-01-19 03:52:39 +00:00
|
|
|
doc::EmbeddedBook,
|
2018-12-04 21:47:46 +00:00
|
|
|
doc::EditionGuide,
|
2018-05-30 17:33:43 +00:00
|
|
|
),
|
|
|
|
Kind::Dist => describe!(
|
|
|
|
dist::Docs,
|
|
|
|
dist::RustcDocs,
|
|
|
|
dist::Mingw,
|
|
|
|
dist::Rustc,
|
|
|
|
dist::DebuggerScripts,
|
|
|
|
dist::Std,
|
|
|
|
dist::Analysis,
|
|
|
|
dist::Src,
|
|
|
|
dist::PlainSourceTarball,
|
|
|
|
dist::Cargo,
|
|
|
|
dist::Rls,
|
|
|
|
dist::Rustfmt,
|
2018-07-17 16:39:54 +00:00
|
|
|
dist::Clippy,
|
2018-12-23 20:20:35 +00:00
|
|
|
dist::Miri,
|
2018-05-30 06:01:35 +00:00
|
|
|
dist::LlvmTools,
|
2018-07-03 18:24:24 +00:00
|
|
|
dist::Lldb,
|
2018-05-30 17:33:43 +00:00
|
|
|
dist::Extended,
|
|
|
|
dist::HashSign
|
|
|
|
),
|
|
|
|
Kind::Install => describe!(
|
|
|
|
install::Docs,
|
|
|
|
install::Std,
|
|
|
|
install::Cargo,
|
|
|
|
install::Rls,
|
|
|
|
install::Rustfmt,
|
2018-07-17 16:39:54 +00:00
|
|
|
install::Clippy,
|
2018-12-23 20:20:35 +00:00
|
|
|
install::Miri,
|
2018-05-30 17:33:43 +00:00
|
|
|
install::Analysis,
|
|
|
|
install::Src,
|
|
|
|
install::Rustc
|
|
|
|
),
|
2017-07-19 12:55:46 +00:00
|
|
|
}
|
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2017-07-19 00:03:38 +00: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-07 05:54:09 +00:00
|
|
|
build,
|
2017-07-30 04:12:53 +00:00
|
|
|
top_stage: build.config.stage.unwrap_or(2),
|
2017-08-07 05:54:09 +00:00
|
|
|
kind,
|
2017-07-19 00:03:38 +00:00
|
|
|
cache: Cache::new(),
|
|
|
|
stack: RefCell::new(Vec::new()),
|
2018-03-16 19:10:47 +00:00
|
|
|
time_spent_on_dependencies: Cell::new(Duration::new(0, 0)),
|
2018-03-10 02:05:06 +00:00
|
|
|
paths: vec![],
|
2018-03-27 10:44:33 +00:00
|
|
|
graph_nodes: RefCell::new(HashMap::new()),
|
|
|
|
graph: RefCell::new(Graph::new()),
|
|
|
|
parent: Cell::new(None),
|
2017-07-19 00:03:38 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let builder = &builder;
|
|
|
|
let mut should_run = ShouldRun::new(builder);
|
2017-07-19 12:55:46 +00:00
|
|
|
for desc in Builder::get_step_descriptions(builder.kind) {
|
|
|
|
should_run = (desc.should_run)(should_run);
|
2017-07-19 00:03:38 +00: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 16:51:58 +00:00
|
|
|
for pathset in should_run.paths {
|
2018-05-30 17:33:43 +00:00
|
|
|
if let PathSet::Set(set) = pathset {
|
|
|
|
set.iter().for_each(|path| {
|
|
|
|
help.push_str(
|
|
|
|
format!(" ./x.py {} {}\n", subcommand, path.display()).as_str(),
|
|
|
|
)
|
|
|
|
})
|
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 16:51:58 +00:00
|
|
|
}
|
2017-07-19 00:03:38 +00:00
|
|
|
}
|
|
|
|
Some(help)
|
|
|
|
}
|
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
pub fn new(build: &Build) -> Builder<'_> {
|
2017-07-30 04:12:53 +00:00
|
|
|
let (kind, paths) = match build.config.cmd {
|
2017-07-05 16:20:20 +00:00
|
|
|
Subcommand::Build { ref paths } => (Kind::Build, &paths[..]),
|
2018-01-15 17:44:00 +00:00
|
|
|
Subcommand::Check { ref paths } => (Kind::Check, &paths[..]),
|
2018-12-04 18:26:54 +00:00
|
|
|
Subcommand::Clippy { ref paths } => (Kind::Clippy, &paths[..]),
|
|
|
|
Subcommand::Fix { ref paths } => (Kind::Fix, &paths[..]),
|
2017-07-05 16:20:20 +00: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 08:25:29 +00:00
|
|
|
Subcommand::Clean { .. } => panic!(),
|
2017-07-05 16:20:20 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let builder = Builder {
|
2017-08-07 05:54:09 +00:00
|
|
|
build,
|
2017-07-30 04:12:53 +00:00
|
|
|
top_stage: build.config.stage.unwrap_or(2),
|
2017-08-07 05:54:09 +00:00
|
|
|
kind,
|
2017-07-05 16:20:20 +00:00
|
|
|
cache: Cache::new(),
|
|
|
|
stack: RefCell::new(Vec::new()),
|
2018-03-16 19:10:47 +00:00
|
|
|
time_spent_on_dependencies: Cell::new(Duration::new(0, 0)),
|
2018-03-10 02:05:06 +00:00
|
|
|
paths: paths.to_owned(),
|
2018-03-27 10:44:33 +00:00
|
|
|
graph_nodes: RefCell::new(HashMap::new()),
|
|
|
|
graph: RefCell::new(Graph::new()),
|
|
|
|
parent: Cell::new(None),
|
2017-07-05 16:20:20 +00:00
|
|
|
};
|
|
|
|
|
2018-03-10 02:05:06 +00:00
|
|
|
builder
|
|
|
|
}
|
|
|
|
|
2018-03-27 14:06:47 +00:00
|
|
|
pub fn execute_cli(&self) -> Graph<String, bool> {
|
Add tests to rustbuild
In order to run tests, previous commits have cfg'd out various parts of
rustbuild. Generally speaking, these are filesystem-related operations
and process-spawning related parts. Then, rustbuild is run "as normal"
and the various steps that where run are retrieved from the cache and
checked against the expected results.
Note that this means that the current implementation primarily tests
"what" we build, but doesn't actually test that what we build *will*
build. In other words, it doesn't do any form of dependency verification
for any crate. This is possible to implement, but is considered future
work.
This implementation strives to cfg out as little code as possible; it
also does not currently test anywhere near all of rustbuild. The current
tests are also not checked for "correctness," rather, they simply
represent what we do as of this commit, which may be wrong.
Test cases are drawn from the old implementation of rustbuild, though
the expected results may vary.
2018-03-10 14:03:06 +00:00
|
|
|
self.run_step_descriptions(&Builder::get_step_descriptions(self.kind), &self.paths);
|
2018-03-27 14:06:47 +00:00
|
|
|
self.graph.borrow().clone()
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn default_doc(&self, paths: Option<&[PathBuf]>) {
|
|
|
|
let paths = paths.unwrap_or(&[]);
|
Add tests to rustbuild
In order to run tests, previous commits have cfg'd out various parts of
rustbuild. Generally speaking, these are filesystem-related operations
and process-spawning related parts. Then, rustbuild is run "as normal"
and the various steps that where run are retrieved from the cache and
checked against the expected results.
Note that this means that the current implementation primarily tests
"what" we build, but doesn't actually test that what we build *will*
build. In other words, it doesn't do any form of dependency verification
for any crate. This is possible to implement, but is considered future
work.
This implementation strives to cfg out as little code as possible; it
also does not currently test anywhere near all of rustbuild. The current
tests are also not checked for "correctness," rather, they simply
represent what we do as of this commit, which may be wrong.
Test cases are drawn from the old implementation of rustbuild, though
the expected results may vary.
2018-03-10 14:03:06 +00:00
|
|
|
self.run_step_descriptions(&Builder::get_step_descriptions(Kind::Doc), paths);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run_step_descriptions(&self, v: &[StepDescription], paths: &[PathBuf]) {
|
|
|
|
StepDescription::run(v, self, paths);
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2017-08-11 18:34:14 +00:00
|
|
|
/// Obtain a compiler at a given stage and for a given host. Explicitly does
|
2017-07-07 17:17:37 +00: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-14 00:48:44 +00:00
|
|
|
pub fn compiler(&self, stage: u32, host: Interned<String>) -> Compiler {
|
2018-05-30 17:33:43 +00:00
|
|
|
self.ensure(compile::Assemble {
|
|
|
|
target_compiler: Compiler { stage, host },
|
|
|
|
})
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2019-05-28 17:00:53 +00:00
|
|
|
/// Similar to `compiler`, except handles the full-bootstrap option to
|
|
|
|
/// silently use the stage1 compiler instead of a stage2 compiler if one is
|
|
|
|
/// requested.
|
|
|
|
///
|
|
|
|
/// Note that this does *not* have the side effect of creating
|
|
|
|
/// `compiler(stage, host)`, unlike `compiler` above which does have such
|
|
|
|
/// a side effect. The returned compiler here can only be used to compile
|
|
|
|
/// new artifacts, it can't be used to rely on the presence of a particular
|
|
|
|
/// sysroot.
|
|
|
|
///
|
|
|
|
/// See `force_use_stage1` for documentation on what each argument is.
|
2019-05-28 18:56:05 +00:00
|
|
|
pub fn compiler_for(
|
|
|
|
&self,
|
|
|
|
stage: u32,
|
|
|
|
host: Interned<String>,
|
|
|
|
target: Interned<String>,
|
|
|
|
) -> Compiler {
|
2019-05-28 17:00:53 +00:00
|
|
|
if self.build.force_use_stage1(Compiler { stage, host }, target) {
|
|
|
|
self.compiler(1, self.config.build)
|
|
|
|
} else {
|
|
|
|
self.compiler(stage, host)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-14 00:48:44 +00:00
|
|
|
pub fn sysroot(&self, compiler: Compiler) -> Interned<PathBuf> {
|
2017-07-05 16:20:20 +00: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-14 00:48:44 +00:00
|
|
|
pub fn sysroot_libdir(
|
2018-05-30 17:33:43 +00:00
|
|
|
&self,
|
|
|
|
compiler: Compiler,
|
|
|
|
target: Interned<String>,
|
2017-07-14 00:48:44 +00:00
|
|
|
) -> Interned<PathBuf> {
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
|
|
|
|
struct Libdir {
|
|
|
|
compiler: Compiler,
|
|
|
|
target: Interned<String>,
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2017-07-14 00:48:44 +00:00
|
|
|
impl Step for Libdir {
|
|
|
|
type Output = Interned<PathBuf>;
|
2017-07-14 12:30:16 +00:00
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
|
2017-07-19 00:03:38 +00:00
|
|
|
run.never()
|
2017-07-14 12:30:16 +00:00
|
|
|
}
|
|
|
|
|
2019-02-25 10:30:32 +00:00
|
|
|
fn run(self, builder: &Builder<'_>) -> Interned<PathBuf> {
|
2019-08-07 20:37:55 +00:00
|
|
|
let lib = builder.sysroot_libdir_relative(self.compiler);
|
2018-05-30 17:33:43 +00:00
|
|
|
let sysroot = builder
|
|
|
|
.sysroot(self.compiler)
|
|
|
|
.join(lib)
|
|
|
|
.join("rustlib")
|
|
|
|
.join(self.target)
|
|
|
|
.join("lib");
|
2017-07-05 16:20:20 +00:00
|
|
|
let _ = fs::remove_dir_all(&sysroot);
|
|
|
|
t!(fs::create_dir_all(&sysroot));
|
2017-07-14 00:48:44 +00:00
|
|
|
INTERNER.intern_path(sysroot)
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
self.ensure(Libdir { compiler, target })
|
|
|
|
}
|
|
|
|
|
2018-01-30 23:40:44 +00:00
|
|
|
pub fn sysroot_codegen_backends(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
self.sysroot_libdir(compiler, compiler.host)
|
2018-04-14 23:27:57 +00:00
|
|
|
.with_file_name(self.config.rust_codegen_backends_dir.clone())
|
2018-01-30 23:40:44 +00:00
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00: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) {
|
2018-04-14 23:27:57 +00:00
|
|
|
self.rustc_snapshot_libdir()
|
2017-07-05 16:20:20 +00:00
|
|
|
} else {
|
2019-03-31 19:28:12 +00:00
|
|
|
match self.config.libdir_relative() {
|
|
|
|
Some(relative_libdir) if compiler.stage >= 1
|
|
|
|
=> self.sysroot(compiler).join(relative_libdir),
|
|
|
|
_ => self.sysroot(compiler).join(libdir(&compiler.host))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the compiler's relative libdir where it stores the dynamic libraries that
|
|
|
|
/// it itself links against.
|
|
|
|
///
|
|
|
|
/// For example this returns `lib` on Unix and `bin` on
|
|
|
|
/// Windows.
|
|
|
|
pub fn libdir_relative(&self, compiler: Compiler) -> &Path {
|
|
|
|
if compiler.is_snapshot(self) {
|
|
|
|
libdir(&self.config.build).as_ref()
|
|
|
|
} else {
|
|
|
|
match self.config.libdir_relative() {
|
|
|
|
Some(relative_libdir) if compiler.stage >= 1
|
|
|
|
=> relative_libdir,
|
|
|
|
_ => libdir(&compiler.host).as_ref()
|
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-07 20:37:55 +00:00
|
|
|
/// Returns the compiler's relative libdir where the standard library and other artifacts are
|
|
|
|
/// found for a compiler's sysroot.
|
|
|
|
///
|
|
|
|
/// For example this returns `lib` on Unix and Windows.
|
|
|
|
pub fn sysroot_libdir_relative(&self, compiler: Compiler) -> &Path {
|
|
|
|
match self.config.libdir_relative() {
|
|
|
|
Some(relative_libdir) if compiler.stage >= 1
|
|
|
|
=> relative_libdir,
|
|
|
|
_ => Path::new("lib")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00: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) {
|
2018-05-30 17:33:43 +00:00
|
|
|
return;
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
add_lib_path(vec![self.rustc_libdir(compiler)], cmd);
|
|
|
|
}
|
|
|
|
|
2019-02-08 13:53:55 +00:00
|
|
|
/// Gets a path to the compiler specified.
|
2017-07-05 17:21:33 +00:00
|
|
|
pub fn rustc(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
if compiler.is_snapshot(self) {
|
|
|
|
self.initial_rustc.clone()
|
|
|
|
} else {
|
2018-05-30 17:33:43 +00:00
|
|
|
self.sysroot(compiler)
|
|
|
|
.join("bin")
|
|
|
|
.join(exe("rustc", &compiler.host))
|
2017-07-05 17:21:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-08 13:53:55 +00:00
|
|
|
/// Gets the paths to all of the compiler's codegen backends.
|
2019-01-16 21:13:58 +00:00
|
|
|
fn codegen_backends(&self, compiler: Compiler) -> impl Iterator<Item = PathBuf> {
|
|
|
|
fs::read_dir(self.sysroot_codegen_backends(compiler))
|
|
|
|
.into_iter()
|
|
|
|
.flatten()
|
|
|
|
.filter_map(Result::ok)
|
|
|
|
.map(|entry| entry.path())
|
|
|
|
}
|
|
|
|
|
2019-03-03 16:50:56 +00:00
|
|
|
pub fn rustdoc(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
self.ensure(tool::Rustdoc { compiler })
|
2017-07-23 02:01:58 +00:00
|
|
|
}
|
|
|
|
|
2019-03-03 16:50:56 +00:00
|
|
|
pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command {
|
2017-07-23 02:01:58 +00:00
|
|
|
let mut cmd = Command::new(&self.out.join("bootstrap/debug/rustdoc"));
|
2017-12-06 08:25:29 +00:00
|
|
|
cmd.env("RUSTC_STAGE", compiler.stage.to_string())
|
2018-05-30 17:33:43 +00:00
|
|
|
.env("RUSTC_SYSROOT", self.sysroot(compiler))
|
2019-02-07 15:20:17 +00:00
|
|
|
// Note that this is *not* the sysroot_libdir because rustdoc must be linked
|
|
|
|
// equivalently to rustc.
|
|
|
|
.env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler))
|
2018-05-30 17:33:43 +00:00
|
|
|
.env("CFG_RELEASE_CHANNEL", &self.config.channel)
|
2019-03-03 16:50:56 +00:00
|
|
|
.env("RUSTDOC_REAL", self.rustdoc(compiler))
|
2018-05-30 17:33:43 +00:00
|
|
|
.env("RUSTDOC_CRATE_VERSION", self.rust_version())
|
|
|
|
.env("RUSTC_BOOTSTRAP", "1");
|
2018-12-12 05:28:43 +00:00
|
|
|
|
|
|
|
// Remove make-related flags that can cause jobserver problems.
|
|
|
|
cmd.env_remove("MAKEFLAGS");
|
|
|
|
cmd.env_remove("MFLAGS");
|
|
|
|
|
2019-03-03 16:50:56 +00:00
|
|
|
if let Some(linker) = self.linker(compiler.host) {
|
2017-12-06 08:25:29 +00:00
|
|
|
cmd.env("RUSTC_TARGET_LINKER", linker);
|
|
|
|
}
|
2017-07-23 02:01:58 +00:00
|
|
|
cmd
|
2017-07-05 17:21:33 +00:00
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00: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`.
|
2018-05-30 17:33:43 +00:00
|
|
|
pub fn cargo(
|
|
|
|
&self,
|
|
|
|
compiler: Compiler,
|
|
|
|
mode: Mode,
|
|
|
|
target: Interned<String>,
|
|
|
|
cmd: &str,
|
|
|
|
) -> Command {
|
2017-07-05 17:14:54 +00:00
|
|
|
let mut cargo = Command::new(&self.initial_cargo);
|
|
|
|
let out_dir = self.stage_out(compiler, mode);
|
2018-07-03 18:59:32 +00:00
|
|
|
|
2019-08-11 17:00:32 +00:00
|
|
|
// Codegen backends are not yet tracked by -Zbinary-dep-depinfo,
|
|
|
|
// so we need to explicitly clear out if they've been updated.
|
|
|
|
for backend in self.codegen_backends(compiler) {
|
|
|
|
self.clear_if_dirty(&out_dir, &backend);
|
|
|
|
}
|
2018-07-03 18:59:32 +00:00
|
|
|
|
2018-09-29 14:40:37 +00:00
|
|
|
if cmd == "doc" || cmd == "rustdoc" {
|
2019-08-11 17:00:32 +00:00
|
|
|
let my_out = match mode {
|
2018-07-03 18:59:32 +00:00
|
|
|
// This is the intended out directory for compiler documentation.
|
2019-08-11 17:00:32 +00:00
|
|
|
Mode::Rustc | Mode::ToolRustc | Mode::Codegen => self.compiler_doc_out(target),
|
|
|
|
_ => self.crate_doc_out(target),
|
|
|
|
};
|
2019-03-03 16:50:56 +00:00
|
|
|
let rustdoc = self.rustdoc(compiler);
|
2018-07-03 18:59:32 +00:00
|
|
|
self.clear_if_dirty(&my_out, &rustdoc);
|
|
|
|
}
|
|
|
|
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
|
|
|
.env("CARGO_TARGET_DIR", out_dir)
|
2018-05-25 12:04:27 +00:00
|
|
|
.arg(cmd);
|
|
|
|
|
2019-01-22 00:47:57 +00:00
|
|
|
// See comment in librustc_llvm/build.rs for why this is necessary, largely llvm-config
|
|
|
|
// needs to not accidentally link to libLLVM in stage0/lib.
|
|
|
|
cargo.env("REAL_LIBRARY_PATH_VAR", &util::dylib_path_var());
|
|
|
|
if let Some(e) = env::var_os(util::dylib_path_var()) {
|
|
|
|
cargo.env("REAL_LIBRARY_PATH", e);
|
|
|
|
}
|
|
|
|
|
2018-05-25 12:04:27 +00:00
|
|
|
if cmd != "install" {
|
|
|
|
cargo.arg("--target")
|
|
|
|
.arg(target);
|
|
|
|
} else {
|
|
|
|
assert_eq!(target, compiler.host);
|
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2018-12-04 18:26:54 +00:00
|
|
|
// Set a flag for `check`/`clippy`/`fix`, so that certain build
|
|
|
|
// scripts can do less work (e.g. not building/requiring LLVM).
|
|
|
|
if cmd == "check" || cmd == "clippy" || cmd == "fix" {
|
2018-04-17 23:50:41 +00:00
|
|
|
cargo.env("RUST_CHECK", "1");
|
|
|
|
}
|
|
|
|
|
2018-12-02 20:47:41 +00:00
|
|
|
match mode {
|
bootstrap: Merge the libtest build step with libstd
Since its inception rustbuild has always worked in three stages: one for
libstd, one for libtest, and one for rustc. These three stages were
architected around crates.io dependencies, where rustc wants to depend
on crates.io crates but said crates don't explicitly depend on libstd,
requiring a sysroot assembly step in the middle. This same logic was
applied for libtest where libtest wants to depend on crates.io crates
(`getopts`) but `getopts` didn't say that it depended on std, so it
needed `std` built ahead of time.
Lots of time has passed since the inception of rustbuild, however,
and we've since gotten to the point where even `std` itself is depending
on crates.io crates (albeit with some wonky configuration). This
commit applies the same logic to the two dependencies that the `test`
crate pulls in from crates.io, `getopts` and `unicode-width`. Over the
many years since rustbuild's inception `unicode-width` was the only
dependency picked up by the `test` crate, so the extra configuration
necessary to get crates building in this crate graph is unlikely to be
too much of a burden on developers.
After this patch it means that there are now only two build phasese of
rustbuild, one for libstd and one for rustc. The libtest/libproc_macro
build phase is all lumped into one now with `std`.
This was originally motivated by rust-lang/cargo#7216 where Cargo was
having to deal with synthesizing dependency edges but this commit makes
them explicit in this repository.
2019-08-16 15:29:08 +00:00
|
|
|
Mode::Std | Mode::ToolBootstrap | Mode::ToolStd => {},
|
2018-12-02 20:47:41 +00:00
|
|
|
Mode::Rustc | Mode::Codegen | Mode::ToolRustc => {
|
|
|
|
// Build proc macros both for the host and the target
|
|
|
|
if target != compiler.host && cmd != "check" {
|
|
|
|
cargo.arg("-Zdual-proc-macros");
|
2019-08-15 20:46:54 +00:00
|
|
|
rustflags.arg("-Zdual-proc-macros");
|
2018-12-02 20:47:41 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2019-08-11 17:00:32 +00:00
|
|
|
// This tells Cargo (and in turn, rustc) to output more complete
|
|
|
|
// dependency information. Most importantly for rustbuild, this
|
|
|
|
// includes sysroot artifacts, like libstd, which means that we don't
|
|
|
|
// need to track those in rustbuild (an error prone process!). This
|
|
|
|
// feature is currently unstable as there may be some bugs and such, but
|
|
|
|
// it represents a big improvement in rustbuild's reliability on
|
|
|
|
// rebuilds, so we're using it here.
|
|
|
|
//
|
|
|
|
// For some additional context, see #63470 (the PR originally adding
|
|
|
|
// this), as well as #63012 which is the tracking issue for this
|
|
|
|
// feature on the rustc side.
|
|
|
|
cargo.arg("-Zbinary-dep-depinfo");
|
|
|
|
|
2018-05-16 23:04:12 +00:00
|
|
|
cargo.arg("-j").arg(self.jobs().to_string());
|
|
|
|
// Remove make-related flags to ensure Cargo can correctly set things up
|
|
|
|
cargo.env_remove("MAKEFLAGS");
|
|
|
|
cargo.env_remove("MFLAGS");
|
2017-09-15 16:40:35 +00:00
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
// FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
|
|
|
|
// Force cargo to output binaries with disambiguating hashes in the name
|
2019-04-30 19:37:05 +00:00
|
|
|
let mut metadata = if compiler.stage == 0 {
|
|
|
|
// Treat stage0 like a special channel, whether it's a normal prior-
|
2018-05-16 00:48:02 +00:00
|
|
|
// release rustc or a local rebuild with the same version, so we
|
|
|
|
// never mix these libraries by accident.
|
2019-04-30 19:37:05 +00:00
|
|
|
"bootstrap".to_string()
|
2018-05-16 00:48:02 +00:00
|
|
|
} else {
|
2019-04-30 19:37:05 +00:00
|
|
|
self.config.channel.to_string()
|
2018-05-16 00:48:02 +00:00
|
|
|
};
|
2019-04-30 19:37:05 +00:00
|
|
|
// We want to make sure that none of the dependencies between
|
|
|
|
// std/test/rustc unify with one another. This is done for weird linkage
|
|
|
|
// reasons but the gist of the problem is that if librustc, libtest, and
|
|
|
|
// libstd all depend on libc from crates.io (which they actually do) we
|
|
|
|
// want to make sure they all get distinct versions. Things get really
|
|
|
|
// weird if we try to unify all these dependencies right now, namely
|
|
|
|
// around how many times the library is linked in dynamic libraries and
|
|
|
|
// such. If rustc were a static executable or if we didn't ship dylibs
|
|
|
|
// this wouldn't be a problem, but we do, so it is. This is in general
|
|
|
|
// just here to make sure things build right. If you can remove this and
|
|
|
|
// things still build right, please do!
|
|
|
|
match mode {
|
|
|
|
Mode::Std => metadata.push_str("std"),
|
|
|
|
_ => {},
|
|
|
|
}
|
2018-05-16 00:48:02 +00:00
|
|
|
cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata);
|
2017-07-05 16:20:20 +00:00
|
|
|
|
|
|
|
let stage;
|
2017-07-05 17:14:54 +00:00
|
|
|
if compiler.stage == 0 && self.local_rebuild {
|
2017-07-05 16:20:20 +00:00
|
|
|
// Assume the local-rebuild rustc already has stage1 features.
|
|
|
|
stage = 1;
|
|
|
|
} else {
|
|
|
|
stage = compiler.stage;
|
|
|
|
}
|
|
|
|
|
2019-08-15 20:42:39 +00:00
|
|
|
let mut rustflags = Rustflags::new();
|
|
|
|
rustflags.env(&format!("RUSTFLAGS_STAGE_{}", stage));
|
2018-01-29 00:09:47 +00:00
|
|
|
if stage != 0 {
|
2019-08-15 20:42:39 +00:00
|
|
|
rustflags.env("RUSTFLAGS_NOT_BOOTSTRAP");
|
2019-08-19 22:52:14 +00:00
|
|
|
} else {
|
2019-08-15 20:42:39 +00:00
|
|
|
rustflags.env("RUSTFLAGS_BOOTSTRAP");
|
2018-01-29 00:09:47 +00:00
|
|
|
}
|
|
|
|
|
2018-12-04 18:26:54 +00:00
|
|
|
if cmd == "clippy" {
|
2019-08-15 20:42:39 +00:00
|
|
|
rustflags.arg("-Zforce-unstable-if-unmarked");
|
2018-01-29 00:09:47 +00:00
|
|
|
}
|
|
|
|
|
2019-08-15 20:46:07 +00:00
|
|
|
rustflags.arg("-Zexternal-macro-backtrace");
|
|
|
|
|
2018-05-05 19:30:42 +00:00
|
|
|
let want_rustdoc = self.doc_tests != DocTests::No;
|
2018-05-05 16:04:06 +00:00
|
|
|
|
2018-06-29 21:35:10 +00:00
|
|
|
// We synthetically interpret a stage0 compiler used to build tools as a
|
|
|
|
// "raw" compiler in that it's the exact snapshot we download. Normally
|
|
|
|
// the stage0 build means it uses libraries build by the stage0
|
|
|
|
// compiler, but for tools we just use the precompiled libraries that
|
|
|
|
// we've downloaded
|
|
|
|
let use_snapshot = mode == Mode::ToolBootstrap;
|
2018-08-02 06:49:36 +00:00
|
|
|
assert!(!use_snapshot || stage == 0 || self.local_rebuild);
|
2018-06-29 21:35:10 +00:00
|
|
|
|
|
|
|
let maybe_sysroot = self.sysroot(compiler);
|
|
|
|
let sysroot = if use_snapshot {
|
|
|
|
self.rustc_snapshot_sysroot()
|
|
|
|
} else {
|
|
|
|
&maybe_sysroot
|
|
|
|
};
|
2019-02-07 15:20:17 +00:00
|
|
|
let libdir = self.rustc_libdir(compiler);
|
2018-06-29 21:35:10 +00:00
|
|
|
|
2017-07-05 16:20:20 +00: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 17:14:54 +00:00
|
|
|
// how the actual compiler itself is called.
|
2017-07-05 16:20:20 +00:00
|
|
|
//
|
|
|
|
// These variables are primarily all read by
|
|
|
|
// src/bootstrap/bin/{rustc.rs,rustdoc.rs}
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
|
|
|
.env("RUSTBUILD_NATIVE_DIR", self.native_dir(target))
|
|
|
|
.env("RUSTC", self.out.join("bootstrap/debug/rustc"))
|
|
|
|
.env("RUSTC_REAL", self.rustc(compiler))
|
|
|
|
.env("RUSTC_STAGE", stage.to_string())
|
|
|
|
.env(
|
|
|
|
"RUSTC_DEBUG_ASSERTIONS",
|
|
|
|
self.config.rust_debug_assertions.to_string(),
|
|
|
|
)
|
2018-06-29 21:35:10 +00:00
|
|
|
.env("RUSTC_SYSROOT", &sysroot)
|
|
|
|
.env("RUSTC_LIBDIR", &libdir)
|
2018-05-30 17:33:43 +00:00
|
|
|
.env("RUSTC_RPATH", self.config.rust_rpath.to_string())
|
|
|
|
.env("RUSTDOC", self.out.join("bootstrap/debug/rustdoc"))
|
|
|
|
.env(
|
|
|
|
"RUSTDOC_REAL",
|
2018-09-29 14:40:37 +00:00
|
|
|
if cmd == "doc" || cmd == "rustdoc" || (cmd == "test" && want_rustdoc) {
|
2019-03-03 16:50:56 +00:00
|
|
|
self.rustdoc(compiler)
|
2018-05-30 17:33:43 +00:00
|
|
|
} else {
|
|
|
|
PathBuf::from("/path/to/nowhere/rustdoc/not/required")
|
|
|
|
},
|
|
|
|
)
|
2019-08-15 20:45:20 +00:00
|
|
|
.env("RUSTC_ERROR_METADATA_DST", self.extended_error_dir())
|
|
|
|
.env("RUSTC_BREAK_ON_ICE", "1");
|
2018-01-15 17:44:00 +00:00
|
|
|
|
2018-04-14 23:27:57 +00:00
|
|
|
if let Some(host_linker) = self.linker(compiler.host) {
|
2017-12-06 08:25:29 +00:00
|
|
|
cargo.env("RUSTC_HOST_LINKER", host_linker);
|
|
|
|
}
|
2018-04-14 23:27:57 +00:00
|
|
|
if let Some(target_linker) = self.linker(target) {
|
2017-12-06 08:25:29 +00:00
|
|
|
cargo.env("RUSTC_TARGET_LINKER", target_linker);
|
|
|
|
}
|
2018-12-04 18:26:54 +00:00
|
|
|
if !(["build", "check", "clippy", "fix", "rustc"].contains(&cmd)) && want_rustdoc {
|
2019-02-07 15:20:17 +00:00
|
|
|
cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler));
|
2018-01-12 07:04:02 +00:00
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2019-05-05 19:15:42 +00:00
|
|
|
let debuginfo_level = match mode {
|
|
|
|
Mode::Rustc | Mode::Codegen => self.config.rust_debuginfo_level_rustc,
|
bootstrap: Merge the libtest build step with libstd
Since its inception rustbuild has always worked in three stages: one for
libstd, one for libtest, and one for rustc. These three stages were
architected around crates.io dependencies, where rustc wants to depend
on crates.io crates but said crates don't explicitly depend on libstd,
requiring a sysroot assembly step in the middle. This same logic was
applied for libtest where libtest wants to depend on crates.io crates
(`getopts`) but `getopts` didn't say that it depended on std, so it
needed `std` built ahead of time.
Lots of time has passed since the inception of rustbuild, however,
and we've since gotten to the point where even `std` itself is depending
on crates.io crates (albeit with some wonky configuration). This
commit applies the same logic to the two dependencies that the `test`
crate pulls in from crates.io, `getopts` and `unicode-width`. Over the
many years since rustbuild's inception `unicode-width` was the only
dependency picked up by the `test` crate, so the extra configuration
necessary to get crates building in this crate graph is unlikely to be
too much of a burden on developers.
After this patch it means that there are now only two build phasese of
rustbuild, one for libstd and one for rustc. The libtest/libproc_macro
build phase is all lumped into one now with `std`.
This was originally motivated by rust-lang/cargo#7216 where Cargo was
having to deal with synthesizing dependency edges but this commit makes
them explicit in this repository.
2019-08-16 15:29:08 +00:00
|
|
|
Mode::Std => self.config.rust_debuginfo_level_std,
|
2019-05-05 19:15:42 +00:00
|
|
|
Mode::ToolBootstrap | Mode::ToolStd |
|
bootstrap: Merge the libtest build step with libstd
Since its inception rustbuild has always worked in three stages: one for
libstd, one for libtest, and one for rustc. These three stages were
architected around crates.io dependencies, where rustc wants to depend
on crates.io crates but said crates don't explicitly depend on libstd,
requiring a sysroot assembly step in the middle. This same logic was
applied for libtest where libtest wants to depend on crates.io crates
(`getopts`) but `getopts` didn't say that it depended on std, so it
needed `std` built ahead of time.
Lots of time has passed since the inception of rustbuild, however,
and we've since gotten to the point where even `std` itself is depending
on crates.io crates (albeit with some wonky configuration). This
commit applies the same logic to the two dependencies that the `test`
crate pulls in from crates.io, `getopts` and `unicode-width`. Over the
many years since rustbuild's inception `unicode-width` was the only
dependency picked up by the `test` crate, so the extra configuration
necessary to get crates building in this crate graph is unlikely to be
too much of a burden on developers.
After this patch it means that there are now only two build phasese of
rustbuild, one for libstd and one for rustc. The libtest/libproc_macro
build phase is all lumped into one now with `std`.
This was originally motivated by rust-lang/cargo#7216 where Cargo was
having to deal with synthesizing dependency edges but this commit makes
them explicit in this repository.
2019-08-16 15:29:08 +00:00
|
|
|
Mode::ToolRustc => self.config.rust_debuginfo_level_tools,
|
2019-05-05 19:15:42 +00:00
|
|
|
};
|
|
|
|
cargo.env("RUSTC_DEBUGINFO_LEVEL", debuginfo_level.to_string());
|
|
|
|
|
|
|
|
if !mode.is_tool() {
|
2017-12-06 08:25:29 +00:00
|
|
|
cargo.env("RUSTC_FORCE_UNSTABLE", "1");
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2017-08-22 21:24:29 +00:00
|
|
|
if let Some(x) = self.crt_static(target) {
|
|
|
|
cargo.env("RUSTC_CRT_STATIC", x.to_string());
|
|
|
|
}
|
|
|
|
|
2018-04-29 09:21:47 +00:00
|
|
|
if let Some(x) = self.crt_static(compiler.host) {
|
|
|
|
cargo.env("RUSTC_HOST_CRT_STATIC", x.to_string());
|
|
|
|
}
|
|
|
|
|
2018-08-30 17:25:07 +00:00
|
|
|
if let Some(map) = self.build.debuginfo_map(GitRepo::Rustc) {
|
|
|
|
cargo.env("RUSTC_DEBUGINFO_MAP", map);
|
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
// Enable usage of unstable features
|
|
|
|
cargo.env("RUSTC_BOOTSTRAP", "1");
|
2017-07-05 17:14:54 +00:00
|
|
|
self.add_rust_test_threads(&mut cargo);
|
2017-07-05 16:20:20 +00: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 17:14:54 +00:00
|
|
|
// build script, however, it itself needs a standard library! This
|
2017-07-05 16:20:20 +00:00
|
|
|
// introduces a bit of a pickle when we're compiling the standard
|
2017-07-05 17:14:54 +00:00
|
|
|
// library itself.
|
2017-07-05 16:20:20 +00:00
|
|
|
//
|
|
|
|
// To work around this we actually end up using the snapshot compiler
|
2017-07-05 17:14:54 +00:00
|
|
|
// (stage0) for compiling build scripts of the standard library itself.
|
2017-07-05 16:20:20 +00: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.
|
2019-03-02 10:43:17 +00:00
|
|
|
if mode == Mode::Std {
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
|
|
|
.env("RUSTC_SNAPSHOT", &self.initial_rustc)
|
|
|
|
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_snapshot_libdir());
|
2017-07-05 16:20:20 +00:00
|
|
|
} else {
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
|
|
|
.env("RUSTC_SNAPSHOT", self.rustc(compiler))
|
|
|
|
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_libdir(compiler));
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2018-07-16 15:22:15 +00:00
|
|
|
if self.config.incremental {
|
2018-01-15 17:44:00 +00:00
|
|
|
cargo.env("CARGO_INCREMENTAL", "1");
|
2019-01-25 10:23:08 +00:00
|
|
|
} else {
|
|
|
|
// Don't rely on any default setting for incr. comp. in Cargo
|
|
|
|
cargo.env("CARGO_INCREMENTAL", "0");
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
|
2017-07-30 04:12:53 +00:00
|
|
|
if let Some(ref on_fail) = self.config.on_fail {
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo.env("RUSTC_ON_FAIL", on_fail);
|
|
|
|
}
|
|
|
|
|
2018-03-16 19:10:47 +00:00
|
|
|
if self.config.print_step_timings {
|
|
|
|
cargo.env("RUSTC_PRINT_STEP_TIMINGS", "1");
|
|
|
|
}
|
|
|
|
|
2018-04-08 11:44:29 +00:00
|
|
|
if self.config.backtrace_on_ice {
|
|
|
|
cargo.env("RUSTC_BACKTRACE_ON_ICE", "1");
|
|
|
|
}
|
|
|
|
|
2018-07-27 09:11:18 +00:00
|
|
|
cargo.env("RUSTC_VERBOSE", self.verbosity.to_string());
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2019-02-08 15:44:50 +00:00
|
|
|
if self.config.deny_warnings {
|
2018-04-01 15:35:53 +00:00
|
|
|
cargo.env("RUSTC_DENY_WARNINGS", "1");
|
|
|
|
}
|
|
|
|
|
2017-12-06 08:25:29 +00: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 16:20:20 +00:00
|
|
|
//
|
|
|
|
// FIXME: the guard against msvc shouldn't need to be here
|
2018-04-24 15:34:14 +00:00
|
|
|
if target.contains("msvc") {
|
|
|
|
if let Some(ref cl) = self.config.llvm_clang_cl {
|
|
|
|
cargo.env("CC", cl).env("CXX", cl);
|
|
|
|
}
|
|
|
|
} else {
|
2018-03-01 05:25:12 +00:00
|
|
|
let ccache = self.config.ccache.as_ref();
|
|
|
|
let ccacheify = |s: &Path| {
|
|
|
|
let ccache = match ccache {
|
|
|
|
Some(ref s) => s,
|
|
|
|
None => return s.display().to_string(),
|
|
|
|
};
|
|
|
|
// FIXME: the cc-rs crate only recognizes the literal strings
|
|
|
|
// `ccache` and `sccache` when doing caching compilations, so we
|
|
|
|
// mirror that here. It should probably be fixed upstream to
|
|
|
|
// accept a new env var or otherwise work with custom ccache
|
|
|
|
// vars.
|
|
|
|
match &ccache[..] {
|
|
|
|
"ccache" | "sccache" => format!("{} {}", ccache, s.display()),
|
|
|
|
_ => s.display().to_string(),
|
|
|
|
}
|
|
|
|
};
|
|
|
|
let cc = ccacheify(&self.cc(target));
|
2019-01-28 17:40:47 +00:00
|
|
|
cargo.env(format!("CC_{}", target), &cc);
|
2017-12-06 08:25:29 +00:00
|
|
|
|
2018-08-30 17:25:07 +00:00
|
|
|
let cflags = self.cflags(target, GitRepo::Rustc).join(" ");
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
2019-01-28 17:40:47 +00:00
|
|
|
.env(format!("CFLAGS_{}", target), cflags.clone());
|
2017-12-06 08:25:29 +00:00
|
|
|
|
|
|
|
if let Some(ar) = self.ar(target) {
|
|
|
|
let ranlib = format!("{} s", ar.display());
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
|
|
|
.env(format!("AR_{}", target), ar)
|
2019-01-28 17:40:47 +00:00
|
|
|
.env(format!("RANLIB_{}", target), ranlib);
|
2017-12-06 08:25:29 +00:00
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2017-07-05 17:14:54 +00:00
|
|
|
if let Ok(cxx) = self.cxx(target) {
|
2018-03-01 05:25:12 +00:00
|
|
|
let cxx = ccacheify(&cxx);
|
2018-05-30 17:33:43 +00:00
|
|
|
cargo
|
|
|
|
.env(format!("CXX_{}", target), &cxx)
|
2019-01-28 17:40:47 +00:00
|
|
|
.env(format!("CXXFLAGS_{}", target), cflags);
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
bootstrap: Allow to invoke cargo with the Usage: rustc [OPTIONS] INPUT
Options:
-h, --help Display this message
--cfg SPEC Configure the compilation environment
-L [KIND=]PATH Add a directory to the library search path. The
optional KIND can be one of dependency, crate, native,
framework or all (the default).
-l [KIND=]NAME Link the generated crate(s) to the specified native
library NAME. The optional KIND can be one of static,
dylib, or framework. If omitted, dylib is assumed.
--crate-type [bin|lib|rlib|dylib|cdylib|staticlib|proc-macro]
Comma separated list of types of crates for the
compiler to emit
--crate-name NAME
Specify the name of the crate being built
--emit [asm|llvm-bc|llvm-ir|obj|metadata|link|dep-info|mir]
Comma separated list of types of output for the
compiler to emit
--print [crate-name|file-names|sysroot|cfg|target-list|target-cpus|target-features|relocation-models|code-models|tls-models|target-spec-json|native-static-libs]
Comma separated list of compiler information to print
on stdout
-g Equivalent to -C debuginfo=2
-O Equivalent to -C opt-level=2
-o FILENAME Write output to <filename>
--out-dir DIR Write output to compiler-chosen filename in <dir>
--explain OPT Provide a detailed explanation of an error message
--test Build a test harness
--target TARGET Target triple for which the code is compiled
-W, --warn OPT Set lint warnings
-A, --allow OPT Set lint allowed
-D, --deny OPT Set lint denied
-F, --forbid OPT Set lint forbidden
--cap-lints LEVEL
Set the most restrictive lint level. More restrictive
lints are capped at this level
-C, --codegen OPT[=VALUE]
Set a codegen option
-V, --version Print version info and exit
-v, --verbose Use verbose output
Additional help:
-C help Print codegen options
-W help Print 'lint' options and default settings
--help -v Print the full set of options rustc accepts command.
2018-08-10 10:22:28 +00:00
|
|
|
if (cmd == "build" || cmd == "rustc")
|
2018-05-19 20:04:41 +00:00
|
|
|
&& mode == Mode::Std
|
2018-05-30 17:33:43 +00:00
|
|
|
&& self.config.extended
|
|
|
|
&& compiler.is_final_stage(self)
|
2018-04-17 09:31:33 +00:00
|
|
|
{
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo.env("RUSTC_SAVE_ANALYSIS", "api".to_string());
|
|
|
|
}
|
|
|
|
|
2017-12-06 08:25:29 +00:00
|
|
|
// For `cargo doc` invocations, make rustdoc print the Rust version into the docs
|
2018-04-14 23:27:57 +00:00
|
|
|
cargo.env("RUSTDOC_CRATE_VERSION", self.rust_version());
|
2017-12-06 08:25:29 +00:00
|
|
|
|
2017-07-05 16:20:20 +00: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 23:59:31 +00:00
|
|
|
// Set this for all builds to make sure doc builds also get it.
|
2018-04-14 23:27:57 +00:00
|
|
|
cargo.env("CFG_RELEASE_CHANNEL", &self.config.channel);
|
2017-07-25 23:59:31 +00:00
|
|
|
|
2018-01-08 21:56:22 +00: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
|
2018-05-08 13:10:16 +00:00
|
|
|
// the binaries we ship of things like rustc_codegen_llvm (aka the rustc_codegen_llvm
|
2018-01-08 21:56:22 +00:00
|
|
|
// 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.
|
2018-05-27 23:56:33 +00:00
|
|
|
if !mode.is_tool() {
|
2018-02-26 17:07:16 +00:00
|
|
|
cargo.env("WINAPI_NO_BUNDLED_LIBRARIES", "1");
|
|
|
|
}
|
2018-01-08 21:56:22 +00:00
|
|
|
|
2018-03-11 23:44:05 +00:00
|
|
|
for _ in 1..self.verbosity {
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo.arg("-v");
|
|
|
|
}
|
2018-01-28 22:50:03 +00:00
|
|
|
|
2018-10-22 14:39:36 +00:00
|
|
|
match (mode, self.config.rust_codegen_units_std, self.config.rust_codegen_units) {
|
|
|
|
(Mode::Std, Some(n), _) |
|
|
|
|
(_, _, Some(n)) => {
|
|
|
|
cargo.env("RUSTC_CODEGEN_UNITS", n.to_string());
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
// Don't set anything
|
|
|
|
}
|
2018-01-28 22:50:03 +00:00
|
|
|
}
|
|
|
|
|
2017-12-06 08:25:29 +00:00
|
|
|
if self.config.rust_optimize {
|
2018-05-25 12:04:27 +00:00
|
|
|
// FIXME: cargo bench/install do not accept `--release`
|
|
|
|
if cmd != "bench" && cmd != "install" {
|
2017-12-06 08:25:29 +00:00
|
|
|
cargo.arg("--release");
|
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2018-01-28 22:50:03 +00:00
|
|
|
|
2017-07-05 17:14:54 +00:00
|
|
|
if self.config.locked_deps {
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo.arg("--locked");
|
|
|
|
}
|
2017-07-05 17:14:54 +00:00
|
|
|
if self.config.vendor || self.is_sudo {
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo.arg("--frozen");
|
|
|
|
}
|
|
|
|
|
2019-09-10 01:01:41 +00:00
|
|
|
cargo.env("RUSTC_INSTALL_BINDIR", &self.config.bindir);
|
|
|
|
|
2017-07-05 17:14:54 +00:00
|
|
|
self.ci_env.force_coloring_in_ci(&mut cargo);
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2019-08-15 20:42:39 +00:00
|
|
|
cargo.env("RUSTFLAGS", &rustflags.0);
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
cargo
|
|
|
|
}
|
|
|
|
|
2018-04-11 22:36:42 +00:00
|
|
|
/// Ensure that a given step is built, returning its output. This will
|
2017-07-07 17:17:37 +00:00
|
|
|
/// 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-14 00:48:44 +00:00
|
|
|
pub fn ensure<S: Step>(&'a self, step: S) -> S::Output {
|
2017-07-05 16:20:20 +00:00
|
|
|
{
|
|
|
|
let mut stack = self.stack.borrow_mut();
|
2017-07-18 00:01:48 +00:00
|
|
|
for stack_step in stack.iter() {
|
|
|
|
// should skip
|
2018-05-30 17:33:43 +00:00
|
|
|
if stack_step
|
|
|
|
.downcast_ref::<S>()
|
|
|
|
.map_or(true, |stack_step| *stack_step != step)
|
|
|
|
{
|
2017-07-18 00:01:48 +00:00
|
|
|
continue;
|
2017-07-14 00:48:44 +00:00
|
|
|
}
|
2017-07-05 16:20:20 +00:00
|
|
|
let mut out = String::new();
|
2017-07-14 00:48:44 +00:00
|
|
|
out += &format!("\n\nCycle in build detected when adding {:?}\n", step);
|
2017-07-05 16:20:20 +00:00
|
|
|
for el in stack.iter().rev() {
|
|
|
|
out += &format!("\t{:?}\n", el);
|
|
|
|
}
|
|
|
|
panic!(out);
|
|
|
|
}
|
2017-07-14 00:48:44 +00:00
|
|
|
if let Some(out) = self.cache.get(&step) {
|
2018-04-14 23:27:57 +00:00
|
|
|
self.verbose(&format!("{}c {:?}", " ".repeat(stack.len()), step));
|
2017-07-05 16:20:20 +00:00
|
|
|
|
2018-03-27 10:44:33 +00:00
|
|
|
{
|
|
|
|
let mut graph = self.graph.borrow_mut();
|
|
|
|
let parent = self.parent.get();
|
2018-05-30 17:33:43 +00:00
|
|
|
let us = *self
|
|
|
|
.graph_nodes
|
|
|
|
.borrow_mut()
|
2018-03-27 10:44:33 +00:00
|
|
|
.entry(format!("{:?}", step))
|
|
|
|
.or_insert_with(|| graph.add_node(format!("{:?}", step)));
|
|
|
|
if let Some(parent) = parent {
|
|
|
|
graph.add_edge(parent, us, false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
return out;
|
|
|
|
}
|
2018-04-14 23:27:57 +00:00
|
|
|
self.verbose(&format!("{}> {:?}", " ".repeat(stack.len()), step));
|
2017-07-18 00:01:48 +00:00
|
|
|
stack.push(Box::new(step.clone()));
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2018-03-16 19:10:47 +00:00
|
|
|
|
2018-03-27 10:44:33 +00:00
|
|
|
let prev_parent = self.parent.get();
|
|
|
|
|
|
|
|
{
|
|
|
|
let mut graph = self.graph.borrow_mut();
|
|
|
|
let parent = self.parent.get();
|
2018-05-30 17:33:43 +00:00
|
|
|
let us = *self
|
|
|
|
.graph_nodes
|
|
|
|
.borrow_mut()
|
2018-03-27 10:44:33 +00:00
|
|
|
.entry(format!("{:?}", step))
|
|
|
|
.or_insert_with(|| graph.add_node(format!("{:?}", step)));
|
|
|
|
self.parent.set(Some(us));
|
|
|
|
if let Some(parent) = parent {
|
|
|
|
graph.add_edge(parent, us, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-16 19:10:47 +00:00
|
|
|
let (out, dur) = {
|
|
|
|
let start = Instant::now();
|
|
|
|
let zero = Duration::new(0, 0);
|
|
|
|
let parent = self.time_spent_on_dependencies.replace(zero);
|
|
|
|
let out = step.clone().run(self);
|
|
|
|
let dur = start.elapsed();
|
|
|
|
let deps = self.time_spent_on_dependencies.replace(parent + dur);
|
|
|
|
(out, dur - deps)
|
|
|
|
};
|
|
|
|
|
2018-03-27 10:44:33 +00:00
|
|
|
self.parent.set(prev_parent);
|
|
|
|
|
2018-04-14 23:27:57 +00:00
|
|
|
if self.config.print_step_timings && dur > Duration::from_millis(100) {
|
2018-05-30 17:33:43 +00:00
|
|
|
println!(
|
|
|
|
"[TIMING] {:?} -- {}.{:03}",
|
|
|
|
step,
|
|
|
|
dur.as_secs(),
|
|
|
|
dur.subsec_nanos() / 1_000_000
|
|
|
|
);
|
2018-03-16 19:10:47 +00:00
|
|
|
}
|
|
|
|
|
2017-07-05 16:20:20 +00:00
|
|
|
{
|
|
|
|
let mut stack = self.stack.borrow_mut();
|
2017-07-18 00:01:48 +00:00
|
|
|
let cur_step = stack.pop().expect("step stack empty");
|
|
|
|
assert_eq!(cur_step.downcast_ref(), Some(&step));
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
2018-05-30 17:33:43 +00:00
|
|
|
self.verbose(&format!(
|
|
|
|
"{}< {:?}",
|
|
|
|
" ".repeat(self.stack.borrow().len()),
|
|
|
|
step
|
|
|
|
));
|
2017-07-14 00:48:44 +00:00
|
|
|
self.cache.put(step, out.clone());
|
|
|
|
out
|
2017-07-05 16:20:20 +00:00
|
|
|
}
|
|
|
|
}
|
Add tests to rustbuild
In order to run tests, previous commits have cfg'd out various parts of
rustbuild. Generally speaking, these are filesystem-related operations
and process-spawning related parts. Then, rustbuild is run "as normal"
and the various steps that where run are retrieved from the cache and
checked against the expected results.
Note that this means that the current implementation primarily tests
"what" we build, but doesn't actually test that what we build *will*
build. In other words, it doesn't do any form of dependency verification
for any crate. This is possible to implement, but is considered future
work.
This implementation strives to cfg out as little code as possible; it
also does not currently test anywhere near all of rustbuild. The current
tests are also not checked for "correctness," rather, they simply
represent what we do as of this commit, which may be wrong.
Test cases are drawn from the old implementation of rustbuild, though
the expected results may vary.
2018-03-10 14:03:06 +00:00
|
|
|
|
|
|
|
#[cfg(test)]
|
2019-06-15 19:21:51 +00:00
|
|
|
mod tests;
|
2019-08-15 20:42:39 +00:00
|
|
|
|
|
|
|
struct Rustflags(String);
|
|
|
|
|
|
|
|
impl Rustflags {
|
|
|
|
fn new() -> Rustflags {
|
|
|
|
let mut ret = Rustflags(String::new());
|
|
|
|
ret.env("RUSTFLAGS");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
fn env(&mut self, env: &str) {
|
|
|
|
if let Ok(s) = env::var(env) {
|
|
|
|
for part in s.split_whitespace() {
|
|
|
|
self.arg(part);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn arg(&mut self, arg: &str) -> &mut Self {
|
|
|
|
assert_eq!(arg.split_whitespace().count(), 1);
|
|
|
|
if self.0.len() > 0 {
|
|
|
|
self.0.push_str(" ");
|
|
|
|
}
|
|
|
|
self.0.push_str(arg);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
}
|