2016-07-05 21:58:20 -07:00
|
|
|
//! Implementation of rustbuild, the Rust build system.
|
2016-05-02 15:16:15 -07:00
|
|
|
//!
|
2016-07-05 21:58:20 -07:00
|
|
|
//! This module, and its descendants, are the implementation of the Rust build
|
|
|
|
//! system. Most of this build system is backed by Cargo but the outer layer
|
|
|
|
//! here serves as the ability to orchestrate calling Cargo, sequencing Cargo
|
2016-11-16 12:31:19 -08:00
|
|
|
//! builds, building artifacts like LLVM, etc. The goals of rustbuild are:
|
2016-07-05 21:58:20 -07:00
|
|
|
//!
|
2016-11-16 12:31:19 -08:00
|
|
|
//! * To be an easily understandable, easily extensible, and maintainable build
|
|
|
|
//! system.
|
|
|
|
//! * Leverage standard tools in the Rust ecosystem to build the compiler, aka
|
|
|
|
//! crates.io and Cargo.
|
|
|
|
//! * A standard interface to build across all platforms, including MSVC
|
|
|
|
//!
|
|
|
|
//! ## Architecture
|
|
|
|
//!
|
2017-07-03 18:20:46 -06:00
|
|
|
//! The build system defers most of the complicated logic managing invocations
|
|
|
|
//! of rustc and rustdoc to Cargo itself. However, moving through various stages
|
|
|
|
//! and copying artifacts is still necessary for it to do. Each time rustbuild
|
|
|
|
//! is invoked, it will iterate through the list of predefined steps and execute
|
|
|
|
//! each serially in turn if it matches the paths passed or is a default rule.
|
|
|
|
//! For each step rustbuild relies on the step internally being incremental and
|
2016-11-16 12:31:19 -08:00
|
|
|
//! parallel. Note, though, that the `-j` parameter to rustbuild gets forwarded
|
|
|
|
//! to appropriate test harnesses and such.
|
|
|
|
//!
|
|
|
|
//! Most of the "meaty" steps that matter are backed by Cargo, which does indeed
|
|
|
|
//! have its own parallelism and incremental management. Later steps, like
|
|
|
|
//! tests, aren't incremental and simply run the entire suite currently.
|
2017-07-03 18:20:46 -06:00
|
|
|
//! However, compiletest itself tries to avoid running tests when the artifacts
|
|
|
|
//! that are involved (mainly the compiler) haven't changed.
|
2016-11-16 12:31:19 -08:00
|
|
|
//!
|
2018-11-27 02:59:49 +00:00
|
|
|
//! When you execute `x.py build`, the steps executed are:
|
2016-11-16 12:31:19 -08:00
|
|
|
//!
|
|
|
|
//! * First, the python script is run. This will automatically download the
|
2017-07-03 18:20:46 -06:00
|
|
|
//! stage0 rustc and cargo according to `src/stage0.txt`, or use the cached
|
2016-11-16 12:31:19 -08:00
|
|
|
//! versions if they're available. These are then used to compile rustbuild
|
|
|
|
//! itself (using Cargo). Finally, control is then transferred to rustbuild.
|
|
|
|
//!
|
|
|
|
//! * Rustbuild takes over, performs sanity checks, probes the environment,
|
2017-07-03 18:20:46 -06:00
|
|
|
//! reads configuration, and starts executing steps as it reads the command
|
|
|
|
//! line arguments (paths) or going through the default rules.
|
|
|
|
//!
|
|
|
|
//! The build output will be something like the following:
|
|
|
|
//!
|
|
|
|
//! Building stage0 std artifacts
|
|
|
|
//! Copying stage0 std
|
|
|
|
//! Building stage0 test artifacts
|
|
|
|
//! Copying stage0 test
|
|
|
|
//! Building stage0 compiler artifacts
|
|
|
|
//! Copying stage0 rustc
|
|
|
|
//! Assembling stage1 compiler
|
|
|
|
//! Building stage1 std artifacts
|
|
|
|
//! Copying stage1 std
|
|
|
|
//! Building stage1 test artifacts
|
|
|
|
//! Copying stage1 test
|
|
|
|
//! Building stage1 compiler artifacts
|
|
|
|
//! Copying stage1 rustc
|
|
|
|
//! Assembling stage2 compiler
|
|
|
|
//! Uplifting stage1 std
|
|
|
|
//! Uplifting stage1 test
|
|
|
|
//! Uplifting stage1 rustc
|
|
|
|
//!
|
|
|
|
//! Let's disect that a little:
|
|
|
|
//!
|
|
|
|
//! ## Building stage0 {std,test,compiler} artifacts
|
|
|
|
//!
|
|
|
|
//! These steps use the provided (downloaded, usually) compiler to compile the
|
|
|
|
//! local Rust source into libraries we can use.
|
|
|
|
//!
|
|
|
|
//! ## Copying stage0 {std,test,rustc}
|
|
|
|
//!
|
|
|
|
//! This copies the build output from Cargo into
|
2019-02-08 14:53:55 +01:00
|
|
|
//! `build/$HOST/stage0-sysroot/lib/rustlib/$ARCH/lib`. FIXME: this step's
|
2017-07-03 18:20:46 -06:00
|
|
|
//! documentation should be expanded -- the information already here may be
|
|
|
|
//! incorrect.
|
|
|
|
//!
|
|
|
|
//! ## Assembling stage1 compiler
|
|
|
|
//!
|
|
|
|
//! This copies the libraries we built in "building stage0 ... artifacts" into
|
|
|
|
//! the stage1 compiler's lib directory. These are the host libraries that the
|
|
|
|
//! compiler itself uses to run. These aren't actually used by artifacts the new
|
|
|
|
//! compiler generates. This step also copies the rustc and rustdoc binaries we
|
|
|
|
//! generated into build/$HOST/stage/bin.
|
|
|
|
//!
|
|
|
|
//! The stage1/bin/rustc is a fully functional compiler, but it doesn't yet have
|
|
|
|
//! any libraries to link built binaries or libraries to. The next 3 steps will
|
|
|
|
//! provide those libraries for it; they are mostly equivalent to constructing
|
|
|
|
//! the stage1/bin compiler so we don't go through them individually.
|
|
|
|
//!
|
2017-07-20 17:51:07 -06:00
|
|
|
//! ## Uplifting stage1 {std,test,rustc}
|
2017-07-03 18:20:46 -06:00
|
|
|
//!
|
|
|
|
//! This step copies the libraries from the stage1 compiler sysroot into the
|
|
|
|
//! stage2 compiler. This is done to avoid rebuilding the compiler; libraries
|
|
|
|
//! we'd build in this step should be identical (in function, if not necessarily
|
|
|
|
//! identical on disk) so there's no need to recompile the compiler again. Note
|
|
|
|
//! that if you want to, you can enable the full-bootstrap option to change this
|
|
|
|
//! behavior.
|
2016-11-16 12:31:19 -08:00
|
|
|
//!
|
|
|
|
//! Each step is driven by a separate Cargo project and rustbuild orchestrates
|
|
|
|
//! copying files between steps and otherwise preparing for Cargo to run.
|
|
|
|
//!
|
|
|
|
//! ## Further information
|
|
|
|
//!
|
|
|
|
//! More documentation can be found in each respective module below, and you can
|
|
|
|
//! also check out the `src/bootstrap/README.md` file for more information.
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2018-07-05 19:30:06 +02:00
|
|
|
#![feature(drain_filter)]
|
2016-12-20 09:38:13 -08:00
|
|
|
|
2019-12-22 17:42:04 -05:00
|
|
|
use std::cell::{Cell, RefCell};
|
|
|
|
use std::collections::{HashMap, HashSet};
|
2015-11-19 15:20:12 -08:00
|
|
|
use std::env;
|
2019-12-22 17:42:04 -05:00
|
|
|
use std::fs::{self, File, OpenOptions};
|
|
|
|
use std::io::{Read, Seek, SeekFrom, Write};
|
|
|
|
use std::path::{Path, PathBuf};
|
2017-09-18 21:21:24 +02:00
|
|
|
use std::process::{self, Command};
|
2017-07-29 22:12:53 -06:00
|
|
|
use std::slice;
|
2018-03-27 16:06:47 +02:00
|
|
|
use std::str;
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2018-07-03 12:24:24 -06:00
|
|
|
#[cfg(unix)]
|
|
|
|
use std::os::unix::fs::symlink as symlink_file;
|
|
|
|
#[cfg(windows)]
|
|
|
|
use std::os::windows::fs::symlink_file;
|
|
|
|
|
2019-12-22 17:42:04 -05:00
|
|
|
use build_helper::{mtime, output, run, run_suppressed, t, try_run, try_run_suppressed};
|
2018-03-27 16:06:47 +02:00
|
|
|
use filetime::FileTime;
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2019-07-15 09:18:32 -07:00
|
|
|
use crate::util::{exe, libdir, CiEnv};
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2019-12-22 17:42:04 -05:00
|
|
|
mod builder;
|
|
|
|
mod cache;
|
2017-09-22 21:34:27 -07:00
|
|
|
mod cc_detect;
|
2016-07-05 21:58:20 -07:00
|
|
|
mod channel;
|
|
|
|
mod check;
|
|
|
|
mod clean;
|
|
|
|
mod compile;
|
|
|
|
mod config;
|
|
|
|
mod dist;
|
|
|
|
mod doc;
|
|
|
|
mod flags;
|
2019-12-22 17:42:04 -05:00
|
|
|
mod format;
|
2016-08-12 23:38:17 -07:00
|
|
|
mod install;
|
2019-12-22 17:42:04 -05:00
|
|
|
mod metadata;
|
2016-07-05 21:58:20 -07:00
|
|
|
mod native;
|
2019-11-26 12:06:30 +01:00
|
|
|
mod run;
|
2016-07-05 21:58:20 -07:00
|
|
|
mod sanity;
|
2019-12-22 17:42:04 -05:00
|
|
|
mod test;
|
2017-07-05 10:46:41 -06:00
|
|
|
mod tool;
|
2017-08-30 18:59:26 +02:00
|
|
|
mod toolstate;
|
2019-12-22 17:42:04 -05:00
|
|
|
pub mod util;
|
2016-07-05 21:58:20 -07:00
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
mod job;
|
|
|
|
|
2018-05-09 17:31:41 +00:00
|
|
|
#[cfg(all(unix, not(target_os = "haiku")))]
|
2016-07-05 21:58:20 -07:00
|
|
|
mod job {
|
2018-12-07 13:21:05 +01:00
|
|
|
pub unsafe fn setup(build: &mut crate::Build) {
|
2017-03-23 22:57:29 +01:00
|
|
|
if build.config.low_priority {
|
2017-05-18 22:24:34 -05:00
|
|
|
libc::setpriority(libc::PRIO_PGRP as _, 0, 10);
|
2017-03-23 22:57:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-06 15:26:14 +00:00
|
|
|
#[cfg(any(target_os = "haiku", target_os = "hermit", not(any(unix, windows))))]
|
2016-07-05 21:58:20 -07:00
|
|
|
mod job {
|
2019-12-22 17:42:04 -05:00
|
|
|
pub unsafe fn setup(_build: &mut crate::Build) {}
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2019-12-22 17:42:04 -05:00
|
|
|
use crate::cache::{Interned, INTERNER};
|
2018-12-07 13:21:05 +01:00
|
|
|
pub use crate::config::Config;
|
|
|
|
use crate::flags::Subcommand;
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2018-04-30 13:29:45 +02:00
|
|
|
const LLVM_TOOLS: &[&str] = &[
|
2018-05-01 06:34:12 +02:00
|
|
|
"llvm-nm", // used to inspect binaries; it shows symbol names, their sizes and visibility
|
|
|
|
"llvm-objcopy", // used to transform ELFs into binary format which flashing tools consume
|
|
|
|
"llvm-objdump", // used to disassemble programs
|
|
|
|
"llvm-profdata", // used to inspect and merge files generated by profiles
|
2018-08-28 14:58:52 +02:00
|
|
|
"llvm-readobj", // used to get information from ELFs/objects that the other tools don't provide
|
2018-07-01 16:51:44 +08:00
|
|
|
"llvm-size", // used to prints the size of the linker sections of a program
|
|
|
|
"llvm-strip", // used to discard symbols from binary files to reduce their size
|
2019-12-22 17:42:04 -05:00
|
|
|
"llvm-ar", // used for creating and modifying archive files
|
2018-04-30 13:29:45 +02:00
|
|
|
];
|
2018-04-30 10:15:48 +02:00
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// A structure representing a Rust compiler.
|
|
|
|
///
|
|
|
|
/// Each compiler has a `stage` that it is associated with and a `host` that
|
|
|
|
/// corresponds to the platform the compiler runs on. This structure is used as
|
|
|
|
/// a parameter to many methods below.
|
2018-03-10 07:01:06 -07:00
|
|
|
#[derive(Eq, PartialOrd, Ord, PartialEq, Clone, Copy, Hash, Debug)]
|
2017-07-13 18:48:44 -06:00
|
|
|
pub struct Compiler {
|
2016-07-05 21:58:20 -07:00
|
|
|
stage: u32,
|
2017-07-13 18:48:44 -06:00
|
|
|
host: Interned<String>,
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2018-05-06 00:04:06 +08:00
|
|
|
#[derive(PartialEq, Eq, Copy, Clone, Debug)]
|
2018-05-06 03:30:42 +08:00
|
|
|
pub enum DocTests {
|
2019-07-05 18:22:08 +01:00
|
|
|
/// Run normal tests and doc tests (default).
|
2018-05-06 00:04:06 +08:00
|
|
|
Yes,
|
2019-07-05 18:22:08 +01:00
|
|
|
/// Do not run any doc tests.
|
2018-05-06 00:04:06 +08:00
|
|
|
No,
|
2019-07-05 18:22:08 +01:00
|
|
|
/// Only run doc tests.
|
2018-05-06 00:04:06 +08:00
|
|
|
Only,
|
|
|
|
}
|
|
|
|
|
2018-08-30 10:25:07 -07:00
|
|
|
pub enum GitRepo {
|
|
|
|
Rustc,
|
|
|
|
Llvm,
|
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// Global configuration for the build system.
|
|
|
|
///
|
|
|
|
/// This structure transitively contains all configuration for the build system.
|
|
|
|
/// All filesystem-encoded configuration is in `config`, all flags are in
|
|
|
|
/// `flags`, and then parsed or probed information is listed in the keys below.
|
|
|
|
///
|
|
|
|
/// This structure is a parameter of almost all methods in the build system,
|
|
|
|
/// although most functions are implemented as free functions rather than
|
|
|
|
/// methods specifically on this structure itself (to make it easier to
|
|
|
|
/// organize).
|
|
|
|
pub struct Build {
|
2019-07-05 18:22:08 +01:00
|
|
|
/// User-specified configuration from `config.toml`.
|
2016-07-05 21:58:20 -07:00
|
|
|
config: Config,
|
|
|
|
|
2019-07-05 18:22:08 +01:00
|
|
|
// Properties derived from the above configuration
|
2016-07-05 21:58:20 -07:00
|
|
|
src: PathBuf,
|
|
|
|
out: PathBuf,
|
2017-02-15 15:57:06 -08:00
|
|
|
rust_info: channel::GitInfo,
|
|
|
|
cargo_info: channel::GitInfo,
|
2017-04-10 11:22:38 -07:00
|
|
|
rls_info: channel::GitInfo,
|
2018-05-28 13:34:29 +02:00
|
|
|
clippy_info: channel::GitInfo,
|
2018-12-23 21:20:35 +01:00
|
|
|
miri_info: channel::GitInfo,
|
2017-11-10 15:09:39 +13:00
|
|
|
rustfmt_info: channel::GitInfo,
|
2019-03-14 02:23:08 +01:00
|
|
|
in_tree_llvm_info: channel::GitInfo,
|
2016-07-14 19:39:55 +02:00
|
|
|
local_rebuild: bool,
|
2017-06-27 13:37:24 -06:00
|
|
|
fail_fast: bool,
|
2018-05-06 03:30:42 +08:00
|
|
|
doc_tests: DocTests,
|
2017-06-27 13:49:21 -06:00
|
|
|
verbosity: usize,
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2019-07-05 18:22:08 +01:00
|
|
|
// Targets for which to build
|
2017-07-13 18:48:44 -06:00
|
|
|
build: Interned<String>,
|
|
|
|
hosts: Vec<Interned<String>>,
|
|
|
|
targets: Vec<Interned<String>>,
|
2017-06-27 15:52:46 -06:00
|
|
|
|
2020-01-28 19:21:22 +01:00
|
|
|
// Stage 0 (downloaded) compiler, lld and cargo or their local rust equivalents
|
2017-06-27 13:32:04 -06:00
|
|
|
initial_rustc: PathBuf,
|
|
|
|
initial_cargo: PathBuf,
|
2020-01-28 19:21:22 +01:00
|
|
|
initial_lld: PathBuf,
|
2020-05-29 10:15:46 +03:00
|
|
|
initial_libdir: PathBuf,
|
2017-06-27 13:32:04 -06:00
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
// Runtime state filled in later on
|
2017-10-10 23:06:22 +03:00
|
|
|
// C/C++ compilers and archiver for all targets
|
|
|
|
cc: HashMap<Interned<String>, cc::Tool>,
|
2017-09-22 21:34:27 -07:00
|
|
|
cxx: HashMap<Interned<String>, cc::Tool>,
|
2017-10-10 23:06:22 +03:00
|
|
|
ar: HashMap<Interned<String>, PathBuf>,
|
2018-05-30 16:36:18 +02:00
|
|
|
ranlib: HashMap<Interned<String>, PathBuf>,
|
2019-07-05 18:22:08 +01:00
|
|
|
// Miscellaneous
|
2017-07-13 18:48:44 -06:00
|
|
|
crates: HashMap<Interned<String>, Crate>,
|
2016-11-16 12:31:19 -08:00
|
|
|
is_sudo: bool,
|
2017-05-18 00:33:20 +08:00
|
|
|
ci_env: CiEnv,
|
2017-09-18 21:21:24 +02:00
|
|
|
delayed_failures: RefCell<Vec<String>>,
|
2018-01-12 12:53:51 -08:00
|
|
|
prerelease_version: Cell<Option<u32>>,
|
2019-12-22 17:42:04 -05:00
|
|
|
tool_artifacts:
|
|
|
|
RefCell<HashMap<Interned<String>, HashMap<String, (&'static str, PathBuf, Vec<String>)>>>,
|
2016-10-21 13:18:09 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
struct Crate {
|
2017-07-13 18:48:44 -06:00
|
|
|
name: Interned<String>,
|
2018-06-08 16:47:16 +02:00
|
|
|
deps: HashSet<Interned<String>>,
|
|
|
|
id: String,
|
2016-10-21 13:18:09 -07:00
|
|
|
path: PathBuf,
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
impl Crate {
|
|
|
|
fn local_path(&self, build: &Build) -> PathBuf {
|
|
|
|
self.path.strip_prefix(&build.config.src).unwrap().into()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-03 00:56:27 +02:00
|
|
|
/// When building Rust various objects are handled differently.
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
|
|
|
|
pub enum DependencyType {
|
|
|
|
/// Libraries originating from proc-macros.
|
|
|
|
Host,
|
|
|
|
/// Typical Rust libraries.
|
|
|
|
Target,
|
|
|
|
/// Non Rust libraries and objects shipped to ease usage of certain targets.
|
|
|
|
TargetSelfContained,
|
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// The various "modes" of invoking Cargo.
|
|
|
|
///
|
|
|
|
/// These entries currently correspond to the various output directories of the
|
|
|
|
/// build system, with each mod generating output in a different directory.
|
2018-05-06 02:33:01 +08:00
|
|
|
#[derive(Debug, Hash, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
|
2016-07-05 21:58:20 -07:00
|
|
|
pub enum Mode {
|
2017-06-27 13:24:37 -06:00
|
|
|
/// Build the standard library, placing output in the "stageN-std" directory.
|
2018-05-19 23:04:41 +03:00
|
|
|
Std,
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2018-05-24 03:20:47 +03:00
|
|
|
/// Build librustc, and compiler libraries, placing output in the "stageN-rustc" directory.
|
2018-05-19 23:04:41 +03:00
|
|
|
Rustc,
|
2018-05-24 03:20:47 +03:00
|
|
|
|
|
|
|
/// Build codegen libraries, placing output in the "stageN-codegen" directory
|
2018-05-19 23:04:41 +03:00
|
|
|
Codegen,
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2018-06-29 14:35:10 -07:00
|
|
|
/// Build some tools, placing output in the "stageN-tools" directory. The
|
|
|
|
/// "other" here is for miscellaneous sets of tools that are built using the
|
|
|
|
/// bootstrap compiler in its entirety (target libraries and all).
|
|
|
|
/// Typically these tools compile with stable Rust.
|
|
|
|
ToolBootstrap,
|
|
|
|
|
|
|
|
/// Compile a tool which uses all libraries we compile (up to rustc).
|
|
|
|
/// Doesn't use the stage0 compiler libraries like "other", and includes
|
|
|
|
/// tools like rustdoc, cargo, rls, etc.
|
2018-07-02 09:33:16 -07:00
|
|
|
ToolStd,
|
2018-05-19 23:04:41 +03:00
|
|
|
ToolRustc,
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2018-05-28 02:56:33 +03:00
|
|
|
impl Mode {
|
|
|
|
pub fn is_tool(&self) -> bool {
|
|
|
|
match self {
|
2018-07-02 09:33:16 -07:00
|
|
|
Mode::ToolBootstrap | Mode::ToolRustc | Mode::ToolStd => true,
|
2019-12-22 17:42:04 -05:00
|
|
|
_ => false,
|
2018-05-28 02:56:33 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
impl Build {
|
|
|
|
/// Creates a new set of build configuration from the `flags` on the command
|
|
|
|
/// line and the filesystem `config`.
|
|
|
|
///
|
|
|
|
/// By default all build output will be placed in the current directory.
|
2017-07-29 22:12:53 -06:00
|
|
|
pub fn new(config: Config) -> Build {
|
|
|
|
let src = config.src.clone();
|
2018-03-09 18:14:35 -07:00
|
|
|
let out = config.out.clone();
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2016-11-16 12:31:19 -08:00
|
|
|
let is_sudo = match env::var_os("SUDO_USER") {
|
2019-12-22 17:42:04 -05:00
|
|
|
Some(sudo_user) => match env::var_os("USER") {
|
|
|
|
Some(user) => user != sudo_user,
|
|
|
|
None => false,
|
|
|
|
},
|
2016-11-16 12:31:19 -08:00
|
|
|
None => false,
|
|
|
|
};
|
2019-03-30 11:14:02 -07:00
|
|
|
|
|
|
|
let ignore_git = config.ignore_git;
|
|
|
|
let rust_info = channel::GitInfo::new(ignore_git, &src);
|
|
|
|
let cargo_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/cargo"));
|
|
|
|
let rls_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/rls"));
|
|
|
|
let clippy_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/clippy"));
|
|
|
|
let miri_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/miri"));
|
|
|
|
let rustfmt_info = channel::GitInfo::new(ignore_git, &src.join("src/tools/rustfmt"));
|
|
|
|
|
|
|
|
// we always try to use git for LLVM builds
|
|
|
|
let in_tree_llvm_info = channel::GitInfo::new(false, &src.join("src/llvm-project"));
|
2016-11-16 12:31:19 -08:00
|
|
|
|
2020-05-29 10:15:46 +03:00
|
|
|
let initial_target_libdir_str = if config.dry_run {
|
|
|
|
"/dummy/lib/path/to/lib/".to_string()
|
2020-05-29 16:50:03 +03:00
|
|
|
} else {
|
|
|
|
output(
|
|
|
|
Command::new(&config.initial_rustc)
|
|
|
|
.arg("--target")
|
|
|
|
.arg(config.build)
|
|
|
|
.arg("--print")
|
|
|
|
.arg("target-libdir"),
|
|
|
|
)
|
|
|
|
};
|
2020-05-29 10:15:46 +03:00
|
|
|
let initial_target_dir = Path::new(&initial_target_libdir_str).parent().unwrap();
|
|
|
|
let initial_lld = initial_target_dir.join("bin").join("rust-lld");
|
|
|
|
|
|
|
|
let initial_sysroot = if config.dry_run {
|
|
|
|
"/dummy".to_string()
|
|
|
|
} else {
|
|
|
|
output(Command::new(&config.initial_rustc).arg("--print").arg("sysroot"))
|
|
|
|
};
|
|
|
|
let initial_libdir = initial_target_dir
|
|
|
|
.parent()
|
|
|
|
.unwrap()
|
|
|
|
.parent()
|
|
|
|
.unwrap()
|
|
|
|
.strip_prefix(initial_sysroot.trim())
|
|
|
|
.unwrap()
|
|
|
|
.to_path_buf();
|
2020-01-28 19:21:22 +01:00
|
|
|
|
2018-03-09 19:19:59 -07:00
|
|
|
let mut build = Build {
|
2017-06-27 13:32:04 -06:00
|
|
|
initial_rustc: config.initial_rustc.clone(),
|
|
|
|
initial_cargo: config.initial_cargo.clone(),
|
2020-01-28 19:21:22 +01:00
|
|
|
initial_lld,
|
2020-05-29 10:15:46 +03:00
|
|
|
initial_libdir,
|
2017-06-27 13:32:04 -06:00
|
|
|
local_rebuild: config.local_rebuild,
|
2017-07-29 22:12:53 -06:00
|
|
|
fail_fast: config.cmd.fail_fast(),
|
2018-02-17 15:45:39 +01:00
|
|
|
doc_tests: config.cmd.doc_tests(),
|
2017-07-29 22:12:53 -06:00
|
|
|
verbosity: config.verbose,
|
2017-06-27 13:32:04 -06:00
|
|
|
|
2017-07-29 22:12:53 -06:00
|
|
|
build: config.build,
|
|
|
|
hosts: config.hosts.clone(),
|
|
|
|
targets: config.targets.clone(),
|
2017-06-27 15:52:46 -06:00
|
|
|
|
2017-08-06 22:54:09 -07:00
|
|
|
config,
|
|
|
|
src,
|
|
|
|
out,
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2017-08-06 22:54:09 -07:00
|
|
|
rust_info,
|
|
|
|
cargo_info,
|
|
|
|
rls_info,
|
2018-05-28 13:34:29 +02:00
|
|
|
clippy_info,
|
2018-12-23 21:20:35 +01:00
|
|
|
miri_info,
|
2017-11-10 15:09:39 +13:00
|
|
|
rustfmt_info,
|
2019-03-14 02:23:08 +01:00
|
|
|
in_tree_llvm_info,
|
2016-07-05 21:58:20 -07:00
|
|
|
cc: HashMap::new(),
|
|
|
|
cxx: HashMap::new(),
|
2017-10-10 23:06:22 +03:00
|
|
|
ar: HashMap::new(),
|
2018-05-30 16:36:18 +02:00
|
|
|
ranlib: HashMap::new(),
|
2016-10-21 13:18:09 -07:00
|
|
|
crates: HashMap::new(),
|
2017-08-06 22:54:09 -07:00
|
|
|
is_sudo,
|
2017-05-18 00:33:20 +08:00
|
|
|
ci_env: CiEnv::current(),
|
2017-09-18 21:21:24 +02:00
|
|
|
delayed_failures: RefCell::new(Vec::new()),
|
2018-01-12 12:53:51 -08:00
|
|
|
prerelease_version: Cell::new(None),
|
2018-03-15 10:58:02 -07:00
|
|
|
tool_artifacts: Default::default(),
|
2018-03-09 19:19:59 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
build.verbose("finding compilers");
|
|
|
|
cc_detect::find(&mut build);
|
|
|
|
build.verbose("running sanity check");
|
|
|
|
sanity::check(&mut build);
|
2018-03-15 17:29:53 -06:00
|
|
|
|
|
|
|
// If local-rust is the same major.minor as the current version, then force a
|
|
|
|
// local-rebuild
|
2019-12-22 17:42:04 -05:00
|
|
|
let local_version_verbose =
|
|
|
|
output(Command::new(&build.initial_rustc).arg("--version").arg("--verbose"));
|
2018-03-15 17:29:53 -06:00
|
|
|
let local_release = local_version_verbose
|
2019-12-22 17:42:04 -05:00
|
|
|
.lines()
|
|
|
|
.filter(|x| x.starts_with("release:"))
|
|
|
|
.next()
|
|
|
|
.unwrap()
|
|
|
|
.trim_start_matches("release:")
|
|
|
|
.trim();
|
2018-03-15 17:29:53 -06:00
|
|
|
let my_version = channel::CFG_RELEASE_NUM;
|
|
|
|
if local_release.split('.').take(2).eq(my_version.split('.').take(2)) {
|
|
|
|
build.verbose(&format!("auto-detected local-rebuild {}", local_release));
|
|
|
|
build.local_rebuild = true;
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
2018-03-15 17:29:53 -06:00
|
|
|
|
2018-03-09 19:19:59 -07:00
|
|
|
build.verbose("learning about cargo");
|
|
|
|
metadata::build(&mut build);
|
|
|
|
|
|
|
|
build
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2017-07-29 22:12:53 -06:00
|
|
|
pub fn build_triple(&self) -> &[Interned<String>] {
|
2019-12-22 17:42:04 -05:00
|
|
|
unsafe { slice::from_raw_parts(&self.build, 1) }
|
2017-07-29 22:12:53 -06:00
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// Executes the entire build, as configured by the flags and configuration.
|
|
|
|
pub fn build(&mut self) {
|
|
|
|
unsafe {
|
2017-03-23 22:57:29 +01:00
|
|
|
job::setup(self);
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2019-10-30 16:56:27 -07:00
|
|
|
if let Subcommand::Format { check } = self.config.cmd {
|
|
|
|
return format::format(self, check);
|
|
|
|
}
|
|
|
|
|
2017-09-20 18:14:19 +01:00
|
|
|
if let Subcommand::Clean { all } = self.config.cmd {
|
|
|
|
return clean::clean(self, all);
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2018-03-27 16:06:47 +02:00
|
|
|
{
|
|
|
|
let builder = builder::Builder::new(&self);
|
|
|
|
if let Some(path) = builder.paths.get(0) {
|
|
|
|
if path == Path::new("nonexistent/path/to/trigger/cargo/metadata") {
|
|
|
|
return;
|
|
|
|
}
|
2018-03-09 19:05:06 -07:00
|
|
|
}
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
|
|
|
|
if !self.config.dry_run {
|
2018-04-01 10:51:24 -06:00
|
|
|
{
|
2018-03-27 16:06:47 +02:00
|
|
|
self.config.dry_run = true;
|
|
|
|
let builder = builder::Builder::new(&self);
|
2018-04-01 10:51:24 -06:00
|
|
|
builder.execute_cli();
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
self.config.dry_run = false;
|
|
|
|
let builder = builder::Builder::new(&self);
|
2018-04-01 10:51:24 -06:00
|
|
|
builder.execute_cli();
|
2018-03-27 16:06:47 +02:00
|
|
|
} else {
|
|
|
|
let builder = builder::Builder::new(&self);
|
2020-02-03 20:13:30 +01:00
|
|
|
builder.execute_cli();
|
2018-03-27 16:06:47 +02:00
|
|
|
}
|
2017-09-18 21:21:24 +02:00
|
|
|
|
|
|
|
// Check for postponed failures from `test --no-fail-fast`.
|
|
|
|
let failures = self.delayed_failures.borrow();
|
|
|
|
if failures.len() > 0 {
|
|
|
|
println!("\n{} command(s) did not execute successfully:\n", failures.len());
|
|
|
|
for failure in failures.iter() {
|
|
|
|
println!(" - {}\n", failure);
|
|
|
|
}
|
|
|
|
process::exit(1);
|
|
|
|
}
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Clear out `dir` if `input` is newer.
|
|
|
|
///
|
|
|
|
/// After this executes, it will also ensure that `dir` exists.
|
2017-10-16 11:40:47 -06:00
|
|
|
fn clear_if_dirty(&self, dir: &Path, input: &Path) -> bool {
|
2016-07-05 21:58:20 -07:00
|
|
|
let stamp = dir.join(".stamp");
|
2017-10-16 11:40:47 -06:00
|
|
|
let mut cleared = false;
|
2016-07-05 21:58:20 -07:00
|
|
|
if mtime(&stamp) < mtime(input) {
|
|
|
|
self.verbose(&format!("Dirty - {}", dir.display()));
|
|
|
|
let _ = fs::remove_dir_all(dir);
|
2017-10-16 11:40:47 -06:00
|
|
|
cleared = true;
|
2016-09-12 21:46:35 -07:00
|
|
|
} else if stamp.exists() {
|
2017-10-16 11:40:47 -06:00
|
|
|
return cleared;
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
t!(fs::create_dir_all(dir));
|
|
|
|
t!(File::create(stamp));
|
2017-10-16 11:40:47 -06:00
|
|
|
cleared
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2019-02-08 14:53:55 +01:00
|
|
|
/// Gets the space-separated set of activated features for the standard
|
2016-07-05 21:58:20 -07:00
|
|
|
/// library.
|
|
|
|
fn std_features(&self) -> String {
|
2017-02-15 17:00:41 -05:00
|
|
|
let mut features = "panic-unwind".to_string();
|
2016-12-29 23:28:11 -05:00
|
|
|
|
2019-03-10 19:27:59 -07:00
|
|
|
if self.config.llvm_libunwind {
|
|
|
|
features.push_str(" llvm-libunwind");
|
|
|
|
}
|
2016-07-26 15:21:25 -05:00
|
|
|
if self.config.backtrace {
|
|
|
|
features.push_str(" backtrace");
|
|
|
|
}
|
2017-02-13 09:57:50 +00:00
|
|
|
if self.config.profiler {
|
|
|
|
features.push_str(" profiler");
|
|
|
|
}
|
2017-06-27 09:51:26 -06:00
|
|
|
features
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2019-02-08 14:53:55 +01:00
|
|
|
/// Gets the space-separated set of activated features for the compiler.
|
2016-07-05 21:58:20 -07:00
|
|
|
fn rustc_features(&self) -> String {
|
2018-10-20 19:15:06 -07:00
|
|
|
let mut features = String::new();
|
|
|
|
if self.config.jemalloc {
|
|
|
|
features.push_str("jemalloc");
|
|
|
|
}
|
2019-10-22 08:51:35 -07:00
|
|
|
if self.config.llvm_enabled() {
|
|
|
|
features.push_str(" llvm");
|
|
|
|
}
|
2018-10-20 19:15:06 -07:00
|
|
|
features
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Component directory that Cargo will produce output into (e.g.
|
|
|
|
/// release/debug)
|
|
|
|
fn cargo_dir(&self) -> &'static str {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.rust_optimize { "release" } else { "debug" }
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2017-10-16 11:40:47 -06:00
|
|
|
fn tools_dir(&self, compiler: Compiler) -> PathBuf {
|
|
|
|
let out = self.out.join(&*compiler.host).join(format!("stage{}-tools-bin", compiler.stage));
|
|
|
|
t!(fs::create_dir_all(&out));
|
|
|
|
out
|
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// Returns the root directory for all output generated in a particular
|
|
|
|
/// stage when running with a particular host compiler.
|
|
|
|
///
|
|
|
|
/// The mode indicates what the root directory is for.
|
2017-07-05 10:46:41 -06:00
|
|
|
fn stage_out(&self, compiler: Compiler, mode: Mode) -> PathBuf {
|
2016-07-05 21:58:20 -07:00
|
|
|
let suffix = match mode {
|
2018-05-19 23:04:41 +03:00
|
|
|
Mode::Std => "-std",
|
|
|
|
Mode::Rustc => "-rustc",
|
2018-08-03 07:22:42 -06:00
|
|
|
Mode::Codegen => "-codegen",
|
2018-06-29 14:35:10 -07:00
|
|
|
Mode::ToolBootstrap => "-bootstrap-tools",
|
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 08:29:08 -07:00
|
|
|
Mode::ToolStd | Mode::ToolRustc => "-tools",
|
2016-07-05 21:58:20 -07:00
|
|
|
};
|
2019-12-22 17:42:04 -05:00
|
|
|
self.out.join(&*compiler.host).join(format!("stage{}{}", compiler.stage, suffix))
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the root output directory for all Cargo output in a given stage,
|
2017-08-15 21:45:21 +02:00
|
|
|
/// running a particular compiler, whether or not we're building the
|
2016-07-05 21:58:20 -07:00
|
|
|
/// standard library, and targeting the specified architecture.
|
2019-12-22 17:42:04 -05:00
|
|
|
fn cargo_out(&self, compiler: Compiler, mode: Mode, target: Interned<String>) -> PathBuf {
|
2017-07-13 18:48:44 -06:00
|
|
|
self.stage_out(compiler, mode).join(&*target).join(self.cargo_dir())
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Root output directory for LLVM compiled for `target`
|
|
|
|
///
|
|
|
|
/// Note that if LLVM is configured externally then the directory returned
|
|
|
|
/// will likely be empty.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn llvm_out(&self, target: Interned<String>) -> PathBuf {
|
|
|
|
self.out.join(&*target).join("llvm")
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
rust: Import LLD for linking wasm objects
This commit imports the LLD project from LLVM to serve as the default linker for
the `wasm32-unknown-unknown` target. The `binaryen` submoule is consequently
removed along with "binaryen linker" support in rustc.
Moving to LLD brings with it a number of benefits for wasm code:
* LLD is itself an actual linker, so there's no need to compile all wasm code
with LTO any more. As a result builds should be *much* speedier as LTO is no
longer forcibly enabled for all builds of the wasm target.
* LLD is quickly becoming an "official solution" for linking wasm code together.
This, I believe at least, is intended to be the main supported linker for
native code and wasm moving forward. Picking up support early on should help
ensure that we can help LLD identify bugs and otherwise prove that it works
great for all our use cases!
* Improvements to the wasm toolchain are currently primarily focused around LLVM
and LLD (from what I can tell at least), so it's in general much better to be
on this bandwagon for bugfixes and new features.
* Historical "hacks" like `wasm-gc` will soon no longer be necessary, LLD
will [natively implement][gc] `--gc-sections` (better than `wasm-gc`!) which
means a postprocessor is no longer needed to show off Rust's "small wasm
binary size".
LLD is added in a pretty standard way to rustc right now. A new rustbuild target
was defined for building LLD, and this is executed when a compiler's sysroot is
being assembled. LLD is compiled against the LLVM that we've got in tree, which
means we're currently on the `release_60` branch, but this may get upgraded in
the near future!
LLD is placed into rustc's sysroot in a `bin` directory. This is similar to
where `gcc.exe` can be found on Windows. This directory is automatically added
to `PATH` whenever rustc executes the linker, allowing us to define a `WasmLd`
linker which implements the interface that `wasm-ld`, LLD's frontend, expects.
Like Emscripten the LLD target is currently only enabled for Tier 1 platforms,
notably OSX/Windows/Linux, and will need to be installed manually for compiling
to wasm on other platforms. LLD is by default turned off in rustbuild, and
requires a `config.toml` option to be enabled to turn it on.
Finally the unstable `#![wasm_import_memory]` attribute was also removed as LLD
has a native option for controlling this.
[gc]: https://reviews.llvm.org/D42511
2017-08-26 18:30:12 -07:00
|
|
|
fn lld_out(&self, target: Interned<String>) -> PathBuf {
|
|
|
|
self.out.join(&*target).join("lld")
|
|
|
|
}
|
|
|
|
|
2016-10-21 13:18:09 -07:00
|
|
|
/// Output directory for all documentation for a target
|
2017-07-13 18:48:44 -06:00
|
|
|
fn doc_out(&self, target: Interned<String>) -> PathBuf {
|
|
|
|
self.out.join(&*target).join("doc")
|
2016-10-21 13:18:09 -07:00
|
|
|
}
|
|
|
|
|
2018-03-20 02:06:38 +00:00
|
|
|
/// Output directory for all documentation for a target
|
|
|
|
fn compiler_doc_out(&self, target: Interned<String>) -> PathBuf {
|
|
|
|
self.out.join(&*target).join("compiler-doc")
|
|
|
|
}
|
|
|
|
|
2017-06-12 21:35:47 +02:00
|
|
|
/// Output directory for some generated md crate documentation for a target (temporary)
|
2017-07-13 18:48:44 -06:00
|
|
|
fn md_doc_out(&self, target: Interned<String>) -> Interned<PathBuf> {
|
|
|
|
INTERNER.intern_path(self.out.join(&*target).join("md-doc"))
|
2017-06-12 21:35:47 +02:00
|
|
|
}
|
|
|
|
|
2017-03-01 15:34:54 -08:00
|
|
|
/// Output directory for all crate documentation for a target (temporary)
|
|
|
|
///
|
|
|
|
/// The artifacts here are then copied into `doc_out` above.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn crate_doc_out(&self, target: Interned<String>) -> PathBuf {
|
|
|
|
self.out.join(&*target).join("crate-docs")
|
2017-03-01 15:34:54 -08:00
|
|
|
}
|
|
|
|
|
2019-02-08 14:53:55 +01:00
|
|
|
/// Returns `true` if no custom `llvm-config` is set for the specified target.
|
2016-08-06 15:54:28 +10:00
|
|
|
///
|
|
|
|
/// If no custom `llvm-config` was specified then Rust's llvm will be used.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn is_rust_llvm(&self, target: Interned<String>) -> bool {
|
|
|
|
match self.config.target_config.get(&target) {
|
2016-08-06 15:54:28 +10:00
|
|
|
Some(ref c) => c.llvm_config.is_none(),
|
2019-12-22 17:42:04 -05:00
|
|
|
None => true,
|
2016-08-06 15:54:28 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// Returns the path to `FileCheck` binary for the specified target
|
2017-07-13 18:48:44 -06:00
|
|
|
fn llvm_filecheck(&self, target: Interned<String>) -> PathBuf {
|
|
|
|
let target_config = self.config.target_config.get(&target);
|
2018-09-25 09:13:02 -06:00
|
|
|
if let Some(s) = target_config.and_then(|c| c.llvm_filecheck.as_ref()) {
|
|
|
|
s.to_path_buf()
|
|
|
|
} else if let Some(s) = target_config.and_then(|c| c.llvm_config.as_ref()) {
|
2016-12-20 19:48:14 +09:00
|
|
|
let llvm_bindir = output(Command::new(s).arg("--bindir"));
|
2018-09-25 09:13:02 -06:00
|
|
|
let filecheck = Path::new(llvm_bindir.trim()).join(exe("FileCheck", &*target));
|
|
|
|
if filecheck.exists() {
|
|
|
|
filecheck
|
|
|
|
} else {
|
|
|
|
// On Fedora the system LLVM installs FileCheck in the
|
|
|
|
// llvm subdirectory of the libdir.
|
|
|
|
let llvm_libdir = output(Command::new(s).arg("--libdir"));
|
2019-12-22 17:42:04 -05:00
|
|
|
let lib_filecheck =
|
|
|
|
Path::new(llvm_libdir.trim()).join("llvm").join(exe("FileCheck", &*target));
|
2018-09-25 09:13:02 -06:00
|
|
|
if lib_filecheck.exists() {
|
|
|
|
lib_filecheck
|
|
|
|
} else {
|
|
|
|
// Return the most normal file name, even though
|
|
|
|
// it doesn't exist, so that any error message
|
|
|
|
// refers to that.
|
|
|
|
filecheck
|
|
|
|
}
|
|
|
|
}
|
2016-07-05 21:58:20 -07:00
|
|
|
} else {
|
2017-07-13 18:48:44 -06:00
|
|
|
let base = self.llvm_out(self.config.build).join("build");
|
2018-05-22 03:40:01 +02:00
|
|
|
let base = if !self.config.ninja && self.config.build.contains("msvc") {
|
|
|
|
if self.config.llvm_optimize {
|
|
|
|
if self.config.llvm_release_debuginfo {
|
|
|
|
base.join("RelWithDebInfo")
|
|
|
|
} else {
|
|
|
|
base.join("Release")
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
base.join("Debug")
|
|
|
|
}
|
2016-07-05 21:58:20 -07:00
|
|
|
} else {
|
2018-05-22 03:40:01 +02:00
|
|
|
base
|
|
|
|
};
|
|
|
|
base.join("bin").join(exe("FileCheck", &*target))
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-27 01:57:30 +03:00
|
|
|
/// Directory for libraries built from C/C++ code and shared between stages.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn native_dir(&self, target: Interned<String>) -> PathBuf {
|
|
|
|
self.out.join(&*target).join("native")
|
2017-01-27 01:57:30 +03:00
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// Root output directory for rust_test_helpers library compiled for
|
|
|
|
/// `target`
|
2017-07-13 18:48:44 -06:00
|
|
|
fn test_helpers_out(&self, target: Interned<String>) -> PathBuf {
|
2017-01-27 01:57:30 +03:00
|
|
|
self.native_dir(target).join("rust-test-helpers")
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2016-11-16 12:31:19 -08:00
|
|
|
/// Adds the `RUST_TEST_THREADS` env var if necessary
|
|
|
|
fn add_rust_test_threads(&self, cmd: &mut Command) {
|
|
|
|
if env::var_os("RUST_TEST_THREADS").is_none() {
|
|
|
|
cmd.env("RUST_TEST_THREADS", self.jobs().to_string());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// Returns the libdir of the snapshot compiler.
|
|
|
|
fn rustc_snapshot_libdir(&self) -> PathBuf {
|
2018-06-29 14:35:10 -07:00
|
|
|
self.rustc_snapshot_sysroot().join(libdir(&self.config.build))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the sysroot of the snapshot compiler.
|
|
|
|
fn rustc_snapshot_sysroot(&self) -> &Path {
|
2017-06-27 13:32:04 -06:00
|
|
|
self.initial_rustc.parent().unwrap().parent().unwrap()
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Runs a command, printing out nice contextual information if it fails.
|
|
|
|
fn run(&self, cmd: &mut Command) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2017-12-07 05:06:48 +08:00
|
|
|
self.verbose(&format!("running: {:?}", cmd));
|
2019-08-01 20:13:47 +02:00
|
|
|
run(cmd)
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2017-02-15 15:57:06 -08:00
|
|
|
/// Runs a command, printing out nice contextual information if it fails.
|
|
|
|
fn run_quiet(&self, cmd: &mut Command) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2017-02-15 15:57:06 -08:00
|
|
|
self.verbose(&format!("running: {:?}", cmd));
|
2017-12-07 05:06:48 +08:00
|
|
|
run_suppressed(cmd)
|
2017-02-15 15:57:06 -08:00
|
|
|
}
|
|
|
|
|
2017-12-07 05:06:48 +08:00
|
|
|
/// Runs a command, printing out nice contextual information if it fails.
|
|
|
|
/// Exits if the command failed to execute at all, otherwise returns its
|
|
|
|
/// `status.success()`.
|
|
|
|
fn try_run(&self, cmd: &mut Command) -> bool {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return true;
|
|
|
|
}
|
2017-06-02 09:27:44 -07:00
|
|
|
self.verbose(&format!("running: {:?}", cmd));
|
2019-08-01 20:13:47 +02:00
|
|
|
try_run(cmd)
|
2017-06-02 09:27:44 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Runs a command, printing out nice contextual information if it fails.
|
|
|
|
/// Exits if the command failed to execute at all, otherwise returns its
|
|
|
|
/// `status.success()`.
|
|
|
|
fn try_run_quiet(&self, cmd: &mut Command) -> bool {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return true;
|
|
|
|
}
|
2017-06-02 09:27:44 -07:00
|
|
|
self.verbose(&format!("running: {:?}", cmd));
|
2017-12-07 05:06:48 +08:00
|
|
|
try_run_suppressed(cmd)
|
2017-06-02 09:27:44 -07:00
|
|
|
}
|
|
|
|
|
2017-06-27 13:49:21 -06:00
|
|
|
pub fn is_verbose(&self) -> bool {
|
|
|
|
self.verbosity > 0
|
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// Prints a message if this build is configured in verbose mode.
|
|
|
|
fn verbose(&self, msg: &str) {
|
2017-06-27 13:49:21 -06:00
|
|
|
if self.is_verbose() {
|
2016-07-05 21:58:20 -07:00
|
|
|
println!("{}", msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-20 12:50:18 +03:00
|
|
|
pub fn is_verbose_than(&self, level: usize) -> bool {
|
|
|
|
self.verbosity > level
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Prints a message if this build is configured in more verbose mode than `level`.
|
|
|
|
fn verbose_than(&self, level: usize, msg: &str) {
|
|
|
|
if self.is_verbose_than(level) {
|
|
|
|
println!("{}", msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-28 17:25:09 +02:00
|
|
|
fn info(&self, msg: &str) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2018-03-28 17:25:09 +02:00
|
|
|
println!("{}", msg);
|
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// Returns the number of parallel jobs that have been configured for this
|
|
|
|
/// build.
|
|
|
|
fn jobs(&self) -> u32 {
|
2017-07-29 22:12:53 -06:00
|
|
|
self.config.jobs.unwrap_or_else(|| num_cpus::get() as u32)
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2020-04-01 04:00:52 +03:00
|
|
|
fn debuginfo_map_to(&self, which: GitRepo) -> Option<String> {
|
2018-08-30 10:25:07 -07:00
|
|
|
if !self.config.rust_remap_debuginfo {
|
2019-12-22 17:42:04 -05:00
|
|
|
return None;
|
2018-08-30 10:25:07 -07:00
|
|
|
}
|
|
|
|
|
2020-04-01 04:00:52 +03:00
|
|
|
match which {
|
2018-08-30 10:25:07 -07:00
|
|
|
GitRepo::Rustc => {
|
2018-10-25 10:29:08 +02:00
|
|
|
let sha = self.rust_sha().unwrap_or(channel::CFG_RELEASE_NUM);
|
2020-04-01 04:00:52 +03:00
|
|
|
Some(format!("/rustc/{}", sha))
|
2018-08-30 10:25:07 -07:00
|
|
|
}
|
2020-04-01 04:00:52 +03:00
|
|
|
GitRepo::Llvm => Some(String::from("/rustc/llvm")),
|
|
|
|
}
|
2018-08-30 10:25:07 -07:00
|
|
|
}
|
|
|
|
|
2016-07-05 21:58:20 -07:00
|
|
|
/// Returns the path to the C compiler for the target specified.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn cc(&self, target: Interned<String>) -> &Path {
|
2017-10-10 23:06:22 +03:00
|
|
|
self.cc[&target].path()
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns a list of flags to pass to the C compiler for the target
|
|
|
|
/// specified.
|
2018-08-30 10:25:07 -07:00
|
|
|
fn cflags(&self, target: Interned<String>, which: GitRepo) -> Vec<String> {
|
2016-07-05 21:58:20 -07:00
|
|
|
// Filter out -O and /O (the optimization flags) that we picked up from
|
2017-09-22 21:34:27 -07:00
|
|
|
// cc-rs because the build scripts will determine that for themselves.
|
2019-12-22 17:42:04 -05:00
|
|
|
let mut base = self.cc[&target]
|
|
|
|
.args()
|
|
|
|
.iter()
|
|
|
|
.map(|s| s.to_string_lossy().into_owned())
|
|
|
|
.filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
|
|
|
|
.collect::<Vec<String>>();
|
2016-07-05 21:58:20 -07:00
|
|
|
|
2017-03-12 14:13:35 -04:00
|
|
|
// If we're compiling on macOS then we add a few unconditional flags
|
2016-07-05 21:58:20 -07:00
|
|
|
// indicating that we want libc++ (more filled out than libstdc++) and
|
|
|
|
// we want to compile for 10.7. This way we can ensure that
|
2018-10-20 19:04:42 -07:00
|
|
|
// LLVM/etc are all properly compiled.
|
2016-07-05 21:58:20 -07:00
|
|
|
if target.contains("apple-darwin") {
|
|
|
|
base.push("-stdlib=libc++".into());
|
|
|
|
}
|
2017-04-17 10:24:33 +02:00
|
|
|
|
|
|
|
// Work around an apparently bad MinGW / GCC optimization,
|
|
|
|
// See: http://lists.llvm.org/pipermail/cfe-dev/2016-December/051980.html
|
|
|
|
// See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78936
|
2017-07-13 18:48:44 -06:00
|
|
|
if &*target == "i686-pc-windows-gnu" {
|
2017-04-17 10:24:33 +02:00
|
|
|
base.push("-fno-omit-frame-pointer".into());
|
|
|
|
}
|
2018-08-30 10:25:07 -07:00
|
|
|
|
2020-04-01 04:00:52 +03:00
|
|
|
if let Some(map_to) = self.debuginfo_map_to(which) {
|
|
|
|
let map = format!("{}={}", self.src.display(), map_to);
|
2019-12-22 17:42:04 -05:00
|
|
|
let cc = self.cc(target);
|
2018-08-30 10:25:07 -07:00
|
|
|
if cc.ends_with("clang") || cc.ends_with("gcc") {
|
2018-10-26 16:23:02 +02:00
|
|
|
base.push(format!("-fdebug-prefix-map={}", map));
|
2018-08-30 10:25:07 -07:00
|
|
|
} else if cc.ends_with("clang-cl.exe") {
|
|
|
|
base.push("-Xclang".into());
|
2018-10-26 16:23:02 +02:00
|
|
|
base.push(format!("-fdebug-prefix-map={}", map));
|
2018-08-30 10:25:07 -07:00
|
|
|
}
|
|
|
|
}
|
2017-06-27 09:51:26 -06:00
|
|
|
base
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the path to the `ar` archive utility for the target specified.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn ar(&self, target: Interned<String>) -> Option<&Path> {
|
2017-10-10 23:06:22 +03:00
|
|
|
self.ar.get(&target).map(|p| &**p)
|
|
|
|
}
|
|
|
|
|
2018-05-30 16:36:18 +02:00
|
|
|
/// Returns the path to the `ranlib` utility for the target specified.
|
|
|
|
fn ranlib(&self, target: Interned<String>) -> Option<&Path> {
|
|
|
|
self.ranlib.get(&target).map(|p| &**p)
|
|
|
|
}
|
|
|
|
|
2017-06-22 11:51:32 -07:00
|
|
|
/// Returns the path to the C++ compiler for the target specified.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn cxx(&self, target: Interned<String>) -> Result<&Path, String> {
|
|
|
|
match self.cxx.get(&target) {
|
2017-06-22 11:51:32 -07:00
|
|
|
Some(p) => Ok(p.path()),
|
2019-12-22 17:42:04 -05:00
|
|
|
None => {
|
|
|
|
Err(format!("target `{}` is not configured as a host, only as a target", target))
|
|
|
|
}
|
2016-09-12 22:43:48 -07:00
|
|
|
}
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2018-02-10 12:22:57 +01:00
|
|
|
/// Returns the path to the linker for the given target if it needs to be overridden.
|
2020-01-28 19:21:22 +01:00
|
|
|
fn linker(&self, target: Interned<String>, can_use_lld: bool) -> Option<&Path> {
|
2019-12-22 17:42:04 -05:00
|
|
|
if let Some(linker) = self.config.target_config.get(&target).and_then(|c| c.linker.as_ref())
|
|
|
|
{
|
2017-10-16 03:20:01 +03:00
|
|
|
Some(linker)
|
2019-12-22 17:42:04 -05:00
|
|
|
} else if target != self.config.build
|
|
|
|
&& util::use_host_linker(&target)
|
|
|
|
&& !target.contains("msvc")
|
|
|
|
{
|
2017-10-15 21:39:16 +03:00
|
|
|
Some(self.cc(target))
|
2020-01-29 18:05:26 +01:00
|
|
|
} else if can_use_lld && self.config.use_lld && self.build == target {
|
2020-01-28 19:21:22 +01:00
|
|
|
Some(&self.initial_lld)
|
2017-10-15 21:39:16 +03:00
|
|
|
} else {
|
|
|
|
None
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
2015-11-19 15:20:12 -08:00
|
|
|
}
|
2016-09-06 21:49:02 -05:00
|
|
|
|
2017-08-22 16:24:29 -05:00
|
|
|
/// Returns if this target should statically link the C runtime, if specified
|
|
|
|
fn crt_static(&self, target: Interned<String>) -> Option<bool> {
|
2017-08-22 16:24:29 -05:00
|
|
|
if target.contains("pc-windows-msvc") {
|
|
|
|
Some(true)
|
|
|
|
} else {
|
2019-12-22 17:42:04 -05:00
|
|
|
self.config.target_config.get(&target).and_then(|t| t.crt_static)
|
2017-08-22 16:24:29 -05:00
|
|
|
}
|
2017-08-22 16:24:29 -05:00
|
|
|
}
|
|
|
|
|
2016-09-06 21:49:02 -05:00
|
|
|
/// Returns the "musl root" for this `target`, if defined
|
2017-07-13 18:48:44 -06:00
|
|
|
fn musl_root(&self, target: Interned<String>) -> Option<&Path> {
|
2019-12-22 17:42:04 -05:00
|
|
|
self.config
|
|
|
|
.target_config
|
|
|
|
.get(&target)
|
2016-10-13 12:01:59 -07:00
|
|
|
.and_then(|t| t.musl_root.as_ref())
|
2020-02-03 20:13:30 +01:00
|
|
|
.or_else(|| self.config.musl_root.as_ref())
|
2016-09-06 21:49:02 -05:00
|
|
|
.map(|p| &**p)
|
|
|
|
}
|
2016-11-14 08:04:39 -08:00
|
|
|
|
Add a new wasm32-unknown-wasi target
This commit adds a new wasm32-based target distributed through rustup,
supported in the standard library, and implemented in the compiler. The
`wasm32-unknown-wasi` target is intended to be a WebAssembly target
which matches the [WASI proposal recently announced.][LINK]. In summary
the WASI target is an effort to define a standard set of syscalls for
WebAssembly modules, allowing WebAssembly modules to not only be
portable across architectures but also be portable across environments
implementing this standard set of system calls.
The wasi target in libstd is still somewhat bare bones. This PR does not
fill out the filesystem, networking, threads, etc. Instead it only
provides the most basic of integration with the wasi syscalls, enabling
features like:
* `Instant::now` and `SystemTime::now` work
* `env::args` is hooked up
* `env::vars` will look up environment variables
* `println!` will print to standard out
* `process::{exit, abort}` should be hooked up appropriately
None of these APIs can work natively on the `wasm32-unknown-unknown`
target, but with the assumption of the WASI set of syscalls we're able
to provide implementations of these syscalls that engines can implement.
Currently the primary engine implementing wasi is [wasmtime], but more
will surely emerge!
In terms of future development of libstd, I think this is something
we'll probably want to discuss. The purpose of the WASI target is to
provide a standardized set of syscalls, but it's *also* to provide a
standard C sysroot for compiling C/C++ programs. This means it's
intended that functions like `read` and `write` are implemented for this
target with a relatively standard definition and implementation. It's
unclear, therefore, how we want to expose file descriptors and how we'll
want to implement system primitives. For example should `std::fs::File`
have a libc-based file descriptor underneath it? The raw wasi file
descriptor? We'll see! Currently these details are all intentionally
hidden and things we can change over time.
A `WasiFd` sample struct was added to the standard library as part of
this commit, but it's not currently used. It shows how all the wasi
syscalls could be ergonomically bound in Rust, and they offer a possible
implementation of primitives like `std::fs::File` if we bind wasi file
descriptors exactly.
Apart from the standard library, there's also the matter of how this
target is integrated with respect to its C standard library. The
reference sysroot, for example, provides managment of standard unix file
descriptors and also standard APIs like `open` (as opposed to the
relative `openat` inspiration for the wasi ssycalls). Currently the
standard library relies on the C sysroot symbols for operations such as
environment management, process exit, and `read`/`write` of stdio fds.
We want these operations in Rust to be interoperable with C if they're
used in the same process. Put another way, if Rust and C are linked into
the same WebAssembly binary they should work together, but that requires
that the same C standard library is used.
We also, however, want the `wasm32-unknown-wasi` target to be
usable-by-default with the Rust compiler without requiring a separate
toolchain to get downloaded and configured. With that in mind, there's
two modes of operation for the `wasm32-unknown-wasi` target:
1. By default the C standard library is statically provided inside of
`liblibc.rlib` distributed as part of the sysroot. This means that
you can `rustc foo.wasm --target wasm32-unknown-unknown` and you're
good to go, a fully workable wasi binary pops out. This is
incompatible with linking in C code, however, which may be compiled
against a different sysroot than the Rust code was previously
compiled against. In this mode the default of `rust-lld` is used to
link binaries.
2. For linking with C code, the `-C target-feature=-crt-static` flag
needs to be passed. This takes inspiration from the musl target for
this flag, but the idea is that you're no longer using the provided
static C runtime, but rather one will be provided externally. This
flag is intended to also get coupled with an external `clang`
compiler configured with its own sysroot. Therefore you'll typically
use this flag with `-C linker=/path/to/clang-script-wrapper`. Using
this mode the Rust code will continue to reference standard C
symbols, but the definition will be pulled in by the linker configured.
Alright so that's all the current state of this PR. I suspect we'll
definitely want to discuss this before landing of course! This PR is
coupled with libc changes as well which I'll be posting shortly.
[LINK]:
[wasmtime]:
2019-02-13 10:02:22 -08:00
|
|
|
/// Returns the sysroot for the wasi target, if defined
|
|
|
|
fn wasi_root(&self, target: Interned<String>) -> Option<&Path> {
|
2019-12-22 17:42:04 -05:00
|
|
|
self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
|
Add a new wasm32-unknown-wasi target
This commit adds a new wasm32-based target distributed through rustup,
supported in the standard library, and implemented in the compiler. The
`wasm32-unknown-wasi` target is intended to be a WebAssembly target
which matches the [WASI proposal recently announced.][LINK]. In summary
the WASI target is an effort to define a standard set of syscalls for
WebAssembly modules, allowing WebAssembly modules to not only be
portable across architectures but also be portable across environments
implementing this standard set of system calls.
The wasi target in libstd is still somewhat bare bones. This PR does not
fill out the filesystem, networking, threads, etc. Instead it only
provides the most basic of integration with the wasi syscalls, enabling
features like:
* `Instant::now` and `SystemTime::now` work
* `env::args` is hooked up
* `env::vars` will look up environment variables
* `println!` will print to standard out
* `process::{exit, abort}` should be hooked up appropriately
None of these APIs can work natively on the `wasm32-unknown-unknown`
target, but with the assumption of the WASI set of syscalls we're able
to provide implementations of these syscalls that engines can implement.
Currently the primary engine implementing wasi is [wasmtime], but more
will surely emerge!
In terms of future development of libstd, I think this is something
we'll probably want to discuss. The purpose of the WASI target is to
provide a standardized set of syscalls, but it's *also* to provide a
standard C sysroot for compiling C/C++ programs. This means it's
intended that functions like `read` and `write` are implemented for this
target with a relatively standard definition and implementation. It's
unclear, therefore, how we want to expose file descriptors and how we'll
want to implement system primitives. For example should `std::fs::File`
have a libc-based file descriptor underneath it? The raw wasi file
descriptor? We'll see! Currently these details are all intentionally
hidden and things we can change over time.
A `WasiFd` sample struct was added to the standard library as part of
this commit, but it's not currently used. It shows how all the wasi
syscalls could be ergonomically bound in Rust, and they offer a possible
implementation of primitives like `std::fs::File` if we bind wasi file
descriptors exactly.
Apart from the standard library, there's also the matter of how this
target is integrated with respect to its C standard library. The
reference sysroot, for example, provides managment of standard unix file
descriptors and also standard APIs like `open` (as opposed to the
relative `openat` inspiration for the wasi ssycalls). Currently the
standard library relies on the C sysroot symbols for operations such as
environment management, process exit, and `read`/`write` of stdio fds.
We want these operations in Rust to be interoperable with C if they're
used in the same process. Put another way, if Rust and C are linked into
the same WebAssembly binary they should work together, but that requires
that the same C standard library is used.
We also, however, want the `wasm32-unknown-wasi` target to be
usable-by-default with the Rust compiler without requiring a separate
toolchain to get downloaded and configured. With that in mind, there's
two modes of operation for the `wasm32-unknown-wasi` target:
1. By default the C standard library is statically provided inside of
`liblibc.rlib` distributed as part of the sysroot. This means that
you can `rustc foo.wasm --target wasm32-unknown-unknown` and you're
good to go, a fully workable wasi binary pops out. This is
incompatible with linking in C code, however, which may be compiled
against a different sysroot than the Rust code was previously
compiled against. In this mode the default of `rust-lld` is used to
link binaries.
2. For linking with C code, the `-C target-feature=-crt-static` flag
needs to be passed. This takes inspiration from the musl target for
this flag, but the idea is that you're no longer using the provided
static C runtime, but rather one will be provided externally. This
flag is intended to also get coupled with an external `clang`
compiler configured with its own sysroot. Therefore you'll typically
use this flag with `-C linker=/path/to/clang-script-wrapper`. Using
this mode the Rust code will continue to reference standard C
symbols, but the definition will be pulled in by the linker configured.
Alright so that's all the current state of this PR. I suspect we'll
definitely want to discuss this before landing of course! This PR is
coupled with libc changes as well which I'll be posting shortly.
[LINK]:
[wasmtime]:
2019-02-13 10:02:22 -08:00
|
|
|
}
|
|
|
|
|
2019-02-08 14:53:55 +01:00
|
|
|
/// Returns `true` if this is a no-std `target`, if defined
|
2018-04-01 18:50:21 +02:00
|
|
|
fn no_std(&self, target: Interned<String>) -> Option<bool> {
|
2019-12-22 17:42:04 -05:00
|
|
|
self.config.target_config.get(&target).map(|t| t.no_std)
|
2018-04-01 18:50:21 +02:00
|
|
|
}
|
|
|
|
|
2019-02-08 14:53:55 +01:00
|
|
|
/// Returns `true` if the target will be tested using the `remote-test-client`
|
travis: Parallelize tests on Android
Currently our slowest test suite on android, run-pass, takes over 5 times longer
than the x86_64 component (~400 -> ~2200s). Typically QEMU emulation does indeed
add overhead, but not 5x for this kind of workload. One of the slowest parts of
the Android process is that *compilation* happens serially. Tests themselves
need to run single-threaded on the emulator (due to how the test harness works)
and this forces the compiles themselves to be single threaded.
Now Travis gives us more than one core per machine, so it'd be much better if we
could take advantage of them! The emulator itself is still fundamentally
single-threaded, but we should see a nice speedup by sending binaries for it to
run much more quickly.
It turns out that we've already got all the tools to do this in-tree. The
qemu-test-{server,client} that are in use for the ARM Linux testing are a
perfect match for the Android emulator. This commit migrates the custom adb
management code in compiletest/rustbuild to the same qemu-test-{server,client}
implementation that ARM Linux uses.
This allows us to lift the parallelism restriction on the compiletest test
suites, namely run-pass. Consequently although we'll still basically run the
tests themselves in single threaded mode we'll be able to compile all of them in
parallel, keeping the pipeline much more full and using more cores for the work
at hand. Additionally the architecture here should be a bit speedier as it
should have less overhead than adb which is a whole new process on both the host
and the emulator!
Locally on an 8 core machine I've seen the run-pass test suite speed up from
taking nearly an hour to only taking 6 minutes. I don't think we'll see quite a
drastic speedup on Travis but I'm hoping this change can place the Android tests
well below 2 hours instead of just above 2 hours.
Because the client/server here are now repurposed for more than just QEMU,
they've been renamed to `remote-test-{server,client}`.
Note that this PR does not currently modify how debuginfo tests are executed on
Android. While parallelizable it wouldn't be quite as easy, so that's left to
another day. Thankfully that test suite is much smaller than the run-pass test
suite.
As a final fix I discovered that the ARM and Android test suites were actually
running all library unit tests (e.g. stdtest, coretest, etc) twice. I've
corrected that to only run tests once which should also give a nice boost in
overall cycle time here.
2017-04-26 08:52:19 -07:00
|
|
|
/// and `remote-test-server` binaries.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn remote_tested(&self, target: Interned<String>) -> bool {
|
2019-12-22 17:42:04 -05:00
|
|
|
self.qemu_rootfs(target).is_some()
|
|
|
|
|| target.contains("android")
|
|
|
|
|| env::var_os("TEST_DEVICE_ADDR").is_some()
|
travis: Parallelize tests on Android
Currently our slowest test suite on android, run-pass, takes over 5 times longer
than the x86_64 component (~400 -> ~2200s). Typically QEMU emulation does indeed
add overhead, but not 5x for this kind of workload. One of the slowest parts of
the Android process is that *compilation* happens serially. Tests themselves
need to run single-threaded on the emulator (due to how the test harness works)
and this forces the compiles themselves to be single threaded.
Now Travis gives us more than one core per machine, so it'd be much better if we
could take advantage of them! The emulator itself is still fundamentally
single-threaded, but we should see a nice speedup by sending binaries for it to
run much more quickly.
It turns out that we've already got all the tools to do this in-tree. The
qemu-test-{server,client} that are in use for the ARM Linux testing are a
perfect match for the Android emulator. This commit migrates the custom adb
management code in compiletest/rustbuild to the same qemu-test-{server,client}
implementation that ARM Linux uses.
This allows us to lift the parallelism restriction on the compiletest test
suites, namely run-pass. Consequently although we'll still basically run the
tests themselves in single threaded mode we'll be able to compile all of them in
parallel, keeping the pipeline much more full and using more cores for the work
at hand. Additionally the architecture here should be a bit speedier as it
should have less overhead than adb which is a whole new process on both the host
and the emulator!
Locally on an 8 core machine I've seen the run-pass test suite speed up from
taking nearly an hour to only taking 6 minutes. I don't think we'll see quite a
drastic speedup on Travis but I'm hoping this change can place the Android tests
well below 2 hours instead of just above 2 hours.
Because the client/server here are now repurposed for more than just QEMU,
they've been renamed to `remote-test-{server,client}`.
Note that this PR does not currently modify how debuginfo tests are executed on
Android. While parallelizable it wouldn't be quite as easy, so that's left to
another day. Thankfully that test suite is much smaller than the run-pass test
suite.
As a final fix I discovered that the ARM and Android test suites were actually
running all library unit tests (e.g. stdtest, coretest, etc) twice. I've
corrected that to only run tests once which should also give a nice boost in
overall cycle time here.
2017-04-26 08:52:19 -07:00
|
|
|
}
|
|
|
|
|
2017-01-28 13:38:06 -08:00
|
|
|
/// Returns the root of the "rootfs" image that this target will be using,
|
|
|
|
/// if one was configured.
|
|
|
|
///
|
|
|
|
/// If `Some` is returned then that means that tests for this target are
|
|
|
|
/// emulated with QEMU and binaries will need to be shipped to the emulator.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn qemu_rootfs(&self, target: Interned<String>) -> Option<&Path> {
|
2019-12-22 17:42:04 -05:00
|
|
|
self.config.target_config.get(&target).and_then(|t| t.qemu_rootfs.as_ref()).map(|p| &**p)
|
2017-01-28 13:38:06 -08:00
|
|
|
}
|
|
|
|
|
2016-11-14 08:04:39 -08:00
|
|
|
/// Path to the python interpreter to use
|
|
|
|
fn python(&self) -> &Path {
|
|
|
|
self.config.python.as_ref().unwrap()
|
|
|
|
}
|
rustbuild: Compile rustc twice, not thrice
This commit switches the rustbuild build system to compiling the
compiler twice for a normal bootstrap rather than the historical three
times.
Rust is a bootstrapped language which means that a previous version of
the compiler is used to build the next version of the compiler. Over
time, however, we change many parts of compiler artifacts such as the
metadata format, symbol names, etc. These changes make artifacts from
one compiler incompatible from another compiler. Consequently if a
compiler wants to be able to use some artifacts then it itself must have
compiled the artifacts.
Historically the rustc build system has achieved this by compiling the
compiler three times:
* An older compiler (stage0) is downloaded to kick off the chain.
* This compiler now compiles a new compiler (stage1)
* The stage1 compiler then compiles another compiler (stage2)
* Finally, the stage2 compiler needs libraries to link against, so it
compiles all the libraries again.
This entire process amounts in compiling the compiler three times.
Additionally, this process always guarantees that the Rust source tree
can compile itself because the stage2 compiler (created by a freshly
created compiler) would successfully compile itself again. This
property, ensuring Rust can compile itself, is quite important!
In general, though, this third compilation is not required for general
purpose development on the compiler. The third compiler (stage2) can
reuse the libraries that were created during the second compile. In
other words, the second compilation can produce both a compiler and the
libraries that compiler will use. These artifacts *must* be compatible
due to the way plugins work today anyway, and they were created by the
same source code so they *should* be compatible as well.
So given all that, this commit switches the default build process to
only compile the compiler three times, avoiding this third compilation
by copying artifacts from the previous one. Along the way a new entry in
the Travis matrix was also added to ensure that our full bootstrap can
succeed. This entry does not run tests, though, as it should not be
necessary.
To restore the old behavior of a full bootstrap (three compiles) you can
either pass:
./configure --enable-full-bootstrap
or if you're using config.toml:
[build]
full-bootstrap = true
Overall this will hopefully be an easy 33% win in build times of the
compiler. If we do 33% less work we should be 33% faster! This in turn
should affect cycle times and such on Travis and AppVeyor positively as
well as making it easier to work on the compiler itself.
2016-12-25 15:20:33 -08:00
|
|
|
|
2018-01-02 16:21:35 -08:00
|
|
|
/// Temporary directory that extended error information is emitted to.
|
|
|
|
fn extended_error_dir(&self) -> PathBuf {
|
|
|
|
self.out.join("tmp/extended-error-metadata")
|
|
|
|
}
|
|
|
|
|
rustbuild: Compile rustc twice, not thrice
This commit switches the rustbuild build system to compiling the
compiler twice for a normal bootstrap rather than the historical three
times.
Rust is a bootstrapped language which means that a previous version of
the compiler is used to build the next version of the compiler. Over
time, however, we change many parts of compiler artifacts such as the
metadata format, symbol names, etc. These changes make artifacts from
one compiler incompatible from another compiler. Consequently if a
compiler wants to be able to use some artifacts then it itself must have
compiled the artifacts.
Historically the rustc build system has achieved this by compiling the
compiler three times:
* An older compiler (stage0) is downloaded to kick off the chain.
* This compiler now compiles a new compiler (stage1)
* The stage1 compiler then compiles another compiler (stage2)
* Finally, the stage2 compiler needs libraries to link against, so it
compiles all the libraries again.
This entire process amounts in compiling the compiler three times.
Additionally, this process always guarantees that the Rust source tree
can compile itself because the stage2 compiler (created by a freshly
created compiler) would successfully compile itself again. This
property, ensuring Rust can compile itself, is quite important!
In general, though, this third compilation is not required for general
purpose development on the compiler. The third compiler (stage2) can
reuse the libraries that were created during the second compile. In
other words, the second compilation can produce both a compiler and the
libraries that compiler will use. These artifacts *must* be compatible
due to the way plugins work today anyway, and they were created by the
same source code so they *should* be compatible as well.
So given all that, this commit switches the default build process to
only compile the compiler three times, avoiding this third compilation
by copying artifacts from the previous one. Along the way a new entry in
the Travis matrix was also added to ensure that our full bootstrap can
succeed. This entry does not run tests, though, as it should not be
necessary.
To restore the old behavior of a full bootstrap (three compiles) you can
either pass:
./configure --enable-full-bootstrap
or if you're using config.toml:
[build]
full-bootstrap = true
Overall this will hopefully be an easy 33% win in build times of the
compiler. If we do 33% less work we should be 33% faster! This in turn
should affect cycle times and such on Travis and AppVeyor positively as
well as making it easier to work on the compiler itself.
2016-12-25 15:20:33 -08:00
|
|
|
/// Tests whether the `compiler` compiling for `target` should be forced to
|
|
|
|
/// use a stage1 compiler instead.
|
|
|
|
///
|
|
|
|
/// Currently, by default, the build system does not perform a "full
|
|
|
|
/// bootstrap" by default where we compile the compiler three times.
|
|
|
|
/// Instead, we compile the compiler two times. The final stage (stage2)
|
|
|
|
/// just copies the libraries from the previous stage, which is what this
|
|
|
|
/// method detects.
|
|
|
|
///
|
|
|
|
/// Here we return `true` if:
|
|
|
|
///
|
|
|
|
/// * The build isn't performing a full bootstrap
|
|
|
|
/// * The `compiler` is in the final stage, 2
|
|
|
|
/// * We're not cross-compiling, so the artifacts are already available in
|
|
|
|
/// stage1
|
|
|
|
///
|
|
|
|
/// When all of these conditions are met the build will lift artifacts from
|
|
|
|
/// the previous stage forward.
|
2017-07-13 18:48:44 -06:00
|
|
|
fn force_use_stage1(&self, compiler: Compiler, target: Interned<String>) -> bool {
|
2019-12-22 17:42:04 -05:00
|
|
|
!self.config.full_bootstrap
|
|
|
|
&& compiler.stage >= 2
|
|
|
|
&& (self.hosts.iter().any(|h| *h == target) || target == self.build)
|
rustbuild: Compile rustc twice, not thrice
This commit switches the rustbuild build system to compiling the
compiler twice for a normal bootstrap rather than the historical three
times.
Rust is a bootstrapped language which means that a previous version of
the compiler is used to build the next version of the compiler. Over
time, however, we change many parts of compiler artifacts such as the
metadata format, symbol names, etc. These changes make artifacts from
one compiler incompatible from another compiler. Consequently if a
compiler wants to be able to use some artifacts then it itself must have
compiled the artifacts.
Historically the rustc build system has achieved this by compiling the
compiler three times:
* An older compiler (stage0) is downloaded to kick off the chain.
* This compiler now compiles a new compiler (stage1)
* The stage1 compiler then compiles another compiler (stage2)
* Finally, the stage2 compiler needs libraries to link against, so it
compiles all the libraries again.
This entire process amounts in compiling the compiler three times.
Additionally, this process always guarantees that the Rust source tree
can compile itself because the stage2 compiler (created by a freshly
created compiler) would successfully compile itself again. This
property, ensuring Rust can compile itself, is quite important!
In general, though, this third compilation is not required for general
purpose development on the compiler. The third compiler (stage2) can
reuse the libraries that were created during the second compile. In
other words, the second compilation can produce both a compiler and the
libraries that compiler will use. These artifacts *must* be compatible
due to the way plugins work today anyway, and they were created by the
same source code so they *should* be compatible as well.
So given all that, this commit switches the default build process to
only compile the compiler three times, avoiding this third compilation
by copying artifacts from the previous one. Along the way a new entry in
the Travis matrix was also added to ensure that our full bootstrap can
succeed. This entry does not run tests, though, as it should not be
necessary.
To restore the old behavior of a full bootstrap (three compiles) you can
either pass:
./configure --enable-full-bootstrap
or if you're using config.toml:
[build]
full-bootstrap = true
Overall this will hopefully be an easy 33% win in build times of the
compiler. If we do 33% less work we should be 33% faster! This in turn
should affect cycle times and such on Travis and AppVeyor positively as
well as making it easier to work on the compiler itself.
2016-12-25 15:20:33 -08:00
|
|
|
}
|
2017-02-15 15:57:06 -08:00
|
|
|
|
|
|
|
/// Given `num` in the form "a.b.c" return a "release string" which
|
|
|
|
/// describes the release version number.
|
|
|
|
///
|
|
|
|
/// For example on nightly this returns "a.b.c-nightly", on beta it returns
|
|
|
|
/// "a.b.c-beta.1" and on stable it just returns "a.b.c".
|
|
|
|
fn release(&self, num: &str) -> String {
|
|
|
|
match &self.config.channel[..] {
|
|
|
|
"stable" => num.to_string(),
|
2019-12-22 17:42:04 -05:00
|
|
|
"beta" => {
|
|
|
|
if self.rust_info.is_git() {
|
|
|
|
format!("{}-beta.{}", num, self.beta_prerelease_version())
|
|
|
|
} else {
|
|
|
|
format!("{}-beta", num)
|
|
|
|
}
|
|
|
|
}
|
2017-02-15 15:57:06 -08:00
|
|
|
"nightly" => format!("{}-nightly", num),
|
|
|
|
_ => format!("{}-dev", num),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-01-12 12:53:51 -08:00
|
|
|
fn beta_prerelease_version(&self) -> u32 {
|
|
|
|
if let Some(s) = self.prerelease_version.get() {
|
2019-12-22 17:42:04 -05:00
|
|
|
return s;
|
2018-01-12 12:53:51 -08:00
|
|
|
}
|
|
|
|
|
2020-06-04 12:16:30 -07:00
|
|
|
// Figure out how many merge commits happened since we branched off master.
|
|
|
|
// That's our beta number!
|
|
|
|
// (Note that we use a `..` range, not the `...` symmetric difference.)
|
2018-01-12 12:53:51 -08:00
|
|
|
let count = output(
|
|
|
|
Command::new("git")
|
|
|
|
.arg("rev-list")
|
|
|
|
.arg("--count")
|
|
|
|
.arg("--merges")
|
2020-06-04 12:16:30 -07:00
|
|
|
.arg("refs/remotes/origin/master..HEAD")
|
2018-01-12 12:53:51 -08:00
|
|
|
.current_dir(&self.src),
|
|
|
|
);
|
|
|
|
let n = count.trim().parse().unwrap();
|
|
|
|
self.prerelease_version.set(Some(n));
|
|
|
|
n
|
|
|
|
}
|
|
|
|
|
2017-02-15 15:57:06 -08:00
|
|
|
/// Returns the value of `release` above for Rust itself.
|
|
|
|
fn rust_release(&self) -> String {
|
|
|
|
self.release(channel::CFG_RELEASE_NUM)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the "package version" for a component given the `num` release
|
|
|
|
/// number.
|
|
|
|
///
|
|
|
|
/// The package version is typically what shows up in the names of tarballs.
|
|
|
|
/// For channels like beta/nightly it's just the channel name, otherwise
|
|
|
|
/// it's the `num` provided.
|
|
|
|
fn package_vers(&self, num: &str) -> String {
|
|
|
|
match &self.config.channel[..] {
|
|
|
|
"stable" => num.to_string(),
|
|
|
|
"beta" => "beta".to_string(),
|
|
|
|
"nightly" => "nightly".to_string(),
|
|
|
|
_ => format!("{}-dev", num),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the value of `package_vers` above for Rust itself.
|
|
|
|
fn rust_package_vers(&self) -> String {
|
|
|
|
self.package_vers(channel::CFG_RELEASE_NUM)
|
|
|
|
}
|
|
|
|
|
2017-03-13 19:49:36 -07:00
|
|
|
/// Returns the value of `package_vers` above for Cargo
|
|
|
|
fn cargo_package_vers(&self) -> String {
|
2017-03-28 08:00:46 +13:00
|
|
|
self.package_vers(&self.release_num("cargo"))
|
2017-03-13 19:49:36 -07:00
|
|
|
}
|
|
|
|
|
2017-04-27 11:49:03 +02:00
|
|
|
/// Returns the value of `package_vers` above for rls
|
|
|
|
fn rls_package_vers(&self) -> String {
|
|
|
|
self.package_vers(&self.release_num("rls"))
|
|
|
|
}
|
|
|
|
|
2018-05-28 13:34:29 +02:00
|
|
|
/// Returns the value of `package_vers` above for clippy
|
|
|
|
fn clippy_package_vers(&self) -> String {
|
|
|
|
self.package_vers(&self.release_num("clippy"))
|
|
|
|
}
|
|
|
|
|
2018-12-23 21:31:45 +01:00
|
|
|
/// Returns the value of `package_vers` above for miri
|
|
|
|
fn miri_package_vers(&self) -> String {
|
|
|
|
self.package_vers(&self.release_num("miri"))
|
|
|
|
}
|
|
|
|
|
2017-11-10 15:09:39 +13:00
|
|
|
/// Returns the value of `package_vers` above for rustfmt
|
|
|
|
fn rustfmt_package_vers(&self) -> String {
|
|
|
|
self.package_vers(&self.release_num("rustfmt"))
|
|
|
|
}
|
|
|
|
|
2018-06-23 05:49:02 -04:00
|
|
|
fn llvm_tools_package_vers(&self) -> String {
|
2019-04-26 18:25:31 +02:00
|
|
|
self.package_vers(channel::CFG_RELEASE_NUM)
|
2018-06-23 05:49:02 -04:00
|
|
|
}
|
2018-06-03 13:56:58 +02:00
|
|
|
|
2018-06-23 05:49:02 -04:00
|
|
|
fn llvm_tools_vers(&self) -> String {
|
2018-06-03 13:56:58 +02:00
|
|
|
self.rust_version()
|
2018-05-30 08:01:35 +02:00
|
|
|
}
|
|
|
|
|
2018-08-14 14:31:12 +02:00
|
|
|
fn llvm_link_tools_dynamically(&self, target: Interned<String>) -> bool {
|
2020-02-03 20:13:30 +01:00
|
|
|
target.contains("linux-gnu") || target.contains("apple-darwin")
|
2018-08-14 14:31:12 +02:00
|
|
|
}
|
|
|
|
|
2017-02-15 15:57:06 -08:00
|
|
|
/// Returns the `version` string associated with this compiler for Rust
|
|
|
|
/// itself.
|
|
|
|
///
|
|
|
|
/// Note that this is a descriptive string which includes the commit date,
|
|
|
|
/// sha, version, etc.
|
|
|
|
fn rust_version(&self) -> String {
|
|
|
|
self.rust_info.version(self, channel::CFG_RELEASE_NUM)
|
|
|
|
}
|
|
|
|
|
2019-02-08 14:53:55 +01:00
|
|
|
/// Returns the full commit hash.
|
2017-08-31 16:37:14 +02:00
|
|
|
fn rust_sha(&self) -> Option<&str> {
|
|
|
|
self.rust_info.sha()
|
|
|
|
}
|
|
|
|
|
2017-03-28 08:00:46 +13:00
|
|
|
/// Returns the `a.b.c` version that the given package is at.
|
|
|
|
fn release_num(&self, package: &str) -> String {
|
2017-04-20 14:32:54 -07:00
|
|
|
let toml_file_name = self.src.join(&format!("src/tools/{}/Cargo.toml", package));
|
2018-11-16 16:22:06 -05:00
|
|
|
let toml = t!(fs::read_to_string(&toml_file_name));
|
2017-03-06 06:55:24 -08:00
|
|
|
for line in toml.lines() {
|
|
|
|
let prefix = "version = \"";
|
|
|
|
let suffix = "\"";
|
|
|
|
if line.starts_with(prefix) && line.ends_with(suffix) {
|
2019-12-22 17:42:04 -05:00
|
|
|
return line[prefix.len()..line.len() - suffix.len()].to_string();
|
2017-03-06 06:55:24 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-28 08:00:46 +13:00
|
|
|
panic!("failed to find version in {}'s Cargo.toml", package)
|
2017-03-17 09:52:12 +13:00
|
|
|
}
|
|
|
|
|
2019-02-08 14:53:55 +01:00
|
|
|
/// Returns `true` if unstable features should be enabled for the compiler
|
2017-02-15 15:57:06 -08:00
|
|
|
/// we're building.
|
|
|
|
fn unstable_features(&self) -> bool {
|
|
|
|
match &self.config.channel[..] {
|
|
|
|
"stable" | "beta" => false,
|
|
|
|
"nightly" | _ => true,
|
|
|
|
}
|
|
|
|
}
|
2017-05-18 00:33:20 +08:00
|
|
|
|
2020-06-14 15:57:21 -07:00
|
|
|
/// Returns a Vec of all the dependencies of the given root crate,
|
|
|
|
/// including transitive dependencies and the root itself. Only includes
|
|
|
|
/// "local" crates (those in the local source tree, not from a registry).
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
fn in_tree_crates(&self, root: &str) -> Vec<&Crate> {
|
2017-07-05 10:20:20 -06:00
|
|
|
let mut ret = Vec::new();
|
Change Step to be invoked with a path when in default mode.
Previously, a Step would be able to tell on its own when it was invoked
"by-default" (that is, `./x.py test` was called instead of `./x.py test
some/path`). This commit replaces that functionality, invoking each Step
with each of the paths it has specified as "should be invoked by."
For example, if a step calls `path("src/tools/cargo")` and
`path("src/doc/cargo")` then it's make_run will be called twice, with
"src/tools/cargo" and "src/doc/cargo." This makes it so that default
handling logic is in builder, instead of spread across various Steps.
However, this meant that some Step specifications needed to be updated,
since for example `rustdoc` can be built by `./x.py build
src/librustdoc` or `./x.py build src/tools/rustdoc`. A `PathSet`
abstraction is added that handles this: now, each Step can not only list
`path(...)` but also `paths(&[a, b, ...])` which will make it so that we
don't invoke it with each of the individual paths, instead invoking it
with the first path in the list (though this shouldn't be depended on).
Future work likely consists of implementing a better/easier way for a
given Step to work with "any" crate in-tree, especially those that want
to run tests, build, or check crates in the std, test, or rustc crate
trees. Currently this is rather painful to do as most of the logic is
duplicated across should_run and make_run. It seems likely this can be
abstracted away into builder somehow.
2018-02-11 09:51:58 -07:00
|
|
|
let mut list = vec![INTERNER.intern_str(root)];
|
2017-07-05 10:20:20 -06:00
|
|
|
let mut visited = HashSet::new();
|
|
|
|
while let Some(krate) = list.pop() {
|
2017-07-13 18:48:44 -06:00
|
|
|
let krate = &self.crates[&krate];
|
2020-06-14 15:57:21 -07:00
|
|
|
ret.push(krate);
|
std: Depend directly on crates.io crates
Ever since we added a Cargo-based build system for the compiler the
standard library has always been a little special, it's never been able
to depend on crates.io crates for runtime dependencies. This has been a
result of various limitations, namely that Cargo doesn't understand that
crates from crates.io depend on libcore, so Cargo tries to build crates
before libcore is finished.
I had an idea this afternoon, however, which lifts the strategy
from #52919 to directly depend on crates.io crates from the standard
library. After all is said and done this removes a whopping three
submodules that we need to manage!
The basic idea here is that for any crate `std` depends on it adds an
*optional* dependency on an empty crate on crates.io, in this case named
`rustc-std-workspace-core`. This crate is overridden via `[patch]` in
this repository to point to a local crate we write, and *that* has a
`path` dependency on libcore.
Note that all `no_std` crates also depend on `compiler_builtins`, but if
we're not using submodules we can publish `compiler_builtins` to
crates.io and all crates can depend on it anyway! The basic strategy
then looks like:
* The standard library (or some transitive dep) decides to depend on a
crate `foo`.
* The standard library adds
```toml
[dependencies]
foo = { version = "0.1", features = ['rustc-dep-of-std'] }
```
* The crate `foo` has an optional dependency on `rustc-std-workspace-core`
* The crate `foo` has an optional dependency on `compiler_builtins`
* The crate `foo` has a feature `rustc-dep-of-std` which activates these
crates and any other necessary infrastructure in the crate.
A sample commit for `dlmalloc` [turns out to be quite simple][commit].
After that all `no_std` crates should largely build "as is" and still be
publishable on crates.io! Notably they should be able to continue to use
stable Rust if necessary, since the `rename-dependency` feature of Cargo
is soon stabilizing.
As a proof of concept, this commit removes the `dlmalloc`,
`libcompiler_builtins`, and `libc` submodules from this repository. Long
thorns in our side these are now gone for good and we can directly
depend on crates.io! It's hoped that in the long term we can bring in
other crates as necessary, but for now this is largely intended to
simply make it easier to manage these crates and remove submodules.
This should be a transparent non-breaking change for all users, but one
possible stickler is that this almost for sure breaks out-of-tree
`std`-building tools like `xargo` and `cargo-xbuild`. I think it should
be relatively easy to get them working, however, as all that's needed is
an entry in the `[patch]` section used to build the standard library.
Hopefully we can work with these tools to solve this problem!
[commit]: https://github.com/alexcrichton/dlmalloc-rs/commit/28ee12db813a3b650a7c25d1c36d2c17dcb88ae3
2018-11-19 21:52:50 -08:00
|
|
|
for dep in &krate.deps {
|
2020-06-14 15:57:21 -07:00
|
|
|
// Don't include optional deps if their features are not
|
|
|
|
// enabled. Ideally this would be computed from `cargo
|
|
|
|
// metadata --features …`, but that is somewhat slow. Just
|
|
|
|
// skip `build_helper` since there aren't any operations we
|
|
|
|
// want to perform on it. In the future, we may want to
|
|
|
|
// consider just filtering all build and dev dependencies in
|
|
|
|
// metadata::build.
|
|
|
|
if visited.insert(dep)
|
|
|
|
&& dep != "build_helper"
|
|
|
|
&& (dep != "profiler_builtins" || self.config.profiler)
|
|
|
|
&& (dep != "rustc_codegen_llvm" || self.config.llvm_enabled())
|
|
|
|
{
|
std: Depend directly on crates.io crates
Ever since we added a Cargo-based build system for the compiler the
standard library has always been a little special, it's never been able
to depend on crates.io crates for runtime dependencies. This has been a
result of various limitations, namely that Cargo doesn't understand that
crates from crates.io depend on libcore, so Cargo tries to build crates
before libcore is finished.
I had an idea this afternoon, however, which lifts the strategy
from #52919 to directly depend on crates.io crates from the standard
library. After all is said and done this removes a whopping three
submodules that we need to manage!
The basic idea here is that for any crate `std` depends on it adds an
*optional* dependency on an empty crate on crates.io, in this case named
`rustc-std-workspace-core`. This crate is overridden via `[patch]` in
this repository to point to a local crate we write, and *that* has a
`path` dependency on libcore.
Note that all `no_std` crates also depend on `compiler_builtins`, but if
we're not using submodules we can publish `compiler_builtins` to
crates.io and all crates can depend on it anyway! The basic strategy
then looks like:
* The standard library (or some transitive dep) decides to depend on a
crate `foo`.
* The standard library adds
```toml
[dependencies]
foo = { version = "0.1", features = ['rustc-dep-of-std'] }
```
* The crate `foo` has an optional dependency on `rustc-std-workspace-core`
* The crate `foo` has an optional dependency on `compiler_builtins`
* The crate `foo` has a feature `rustc-dep-of-std` which activates these
crates and any other necessary infrastructure in the crate.
A sample commit for `dlmalloc` [turns out to be quite simple][commit].
After that all `no_std` crates should largely build "as is" and still be
publishable on crates.io! Notably they should be able to continue to use
stable Rust if necessary, since the `rename-dependency` feature of Cargo
is soon stabilizing.
As a proof of concept, this commit removes the `dlmalloc`,
`libcompiler_builtins`, and `libc` submodules from this repository. Long
thorns in our side these are now gone for good and we can directly
depend on crates.io! It's hoped that in the long term we can bring in
other crates as necessary, but for now this is largely intended to
simply make it easier to manage these crates and remove submodules.
This should be a transparent non-breaking change for all users, but one
possible stickler is that this almost for sure breaks out-of-tree
`std`-building tools like `xargo` and `cargo-xbuild`. I think it should
be relatively easy to get them working, however, as all that's needed is
an entry in the `[patch]` section used to build the standard library.
Hopefully we can work with these tools to solve this problem!
[commit]: https://github.com/alexcrichton/dlmalloc-rs/commit/28ee12db813a3b650a7c25d1c36d2c17dcb88ae3
2018-11-19 21:52:50 -08:00
|
|
|
list.push(*dep);
|
2017-07-05 10:20:20 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ret
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
|
2020-06-03 00:56:27 +02:00
|
|
|
fn read_stamp_file(&self, stamp: &Path) -> Vec<(PathBuf, DependencyType)> {
|
2018-03-27 16:06:47 +02:00
|
|
|
if self.config.dry_run {
|
|
|
|
return Vec::new();
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut paths = Vec::new();
|
2019-10-17 16:57:46 +08:00
|
|
|
let contents = t!(fs::read(stamp), &stamp);
|
2018-03-27 16:06:47 +02:00
|
|
|
// This is the method we use for extracting paths from the stamp file passed to us. See
|
|
|
|
// run_cargo for more information (in compile.rs).
|
|
|
|
for part in contents.split(|b| *b == 0) {
|
|
|
|
if part.is_empty() {
|
2019-12-22 17:42:04 -05:00
|
|
|
continue;
|
2018-03-27 16:06:47 +02:00
|
|
|
}
|
2020-06-03 00:56:27 +02:00
|
|
|
let dependency_type = match part[0] as char {
|
|
|
|
'h' => DependencyType::Host,
|
|
|
|
's' => DependencyType::TargetSelfContained,
|
|
|
|
't' => DependencyType::Target,
|
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
2018-12-02 21:47:41 +01:00
|
|
|
let path = PathBuf::from(t!(str::from_utf8(&part[1..])));
|
2020-06-03 00:56:27 +02:00
|
|
|
paths.push((path, dependency_type));
|
2018-03-27 16:06:47 +02:00
|
|
|
}
|
|
|
|
paths
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Copies a file from `src` to `dst`
|
|
|
|
pub fn copy(&self, src: &Path, dst: &Path) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2019-03-20 12:50:18 +03:00
|
|
|
self.verbose_than(1, &format!("Copy {:?} to {:?}", src, dst));
|
2019-12-22 17:42:04 -05:00
|
|
|
if src == dst {
|
|
|
|
return;
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
let _ = fs::remove_file(&dst);
|
2018-07-03 12:24:24 -06:00
|
|
|
let metadata = t!(src.symlink_metadata());
|
|
|
|
if metadata.file_type().is_symlink() {
|
|
|
|
let link = t!(fs::read_link(src));
|
|
|
|
t!(symlink_file(link, dst));
|
|
|
|
} else if let Ok(()) = fs::hard_link(src, dst) {
|
|
|
|
// Attempt to "easy copy" by creating a hard link
|
|
|
|
// (symlinks don't work on windows), but if that fails
|
|
|
|
// just fall back to a slow `copy` operation.
|
|
|
|
} else {
|
|
|
|
if let Err(e) = fs::copy(src, dst) {
|
2019-12-22 17:42:04 -05:00
|
|
|
panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
|
2018-07-03 12:24:24 -06:00
|
|
|
}
|
|
|
|
t!(fs::set_permissions(dst, metadata.permissions()));
|
|
|
|
let atime = FileTime::from_last_access_time(&metadata);
|
|
|
|
let mtime = FileTime::from_last_modification_time(&metadata);
|
|
|
|
t!(filetime::set_file_times(dst, atime, mtime));
|
2018-03-27 16:06:47 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Search-and-replaces within a file. (Not maximally efficiently: allocates a
|
|
|
|
/// new string for each replacement.)
|
|
|
|
pub fn replace_in_file(&self, path: &Path, replacements: &[(&str, &str)]) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
let mut contents = String::new();
|
|
|
|
let mut file = t!(OpenOptions::new().read(true).write(true).open(path));
|
|
|
|
t!(file.read_to_string(&mut contents));
|
|
|
|
for &(target, replacement) in replacements {
|
|
|
|
contents = contents.replace(target, replacement);
|
|
|
|
}
|
|
|
|
t!(file.seek(SeekFrom::Start(0)));
|
|
|
|
t!(file.set_len(0));
|
|
|
|
t!(file.write_all(contents.as_bytes()));
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Copies the `src` directory recursively to `dst`. Both are assumed to exist
|
|
|
|
/// when this function is called.
|
|
|
|
pub fn cp_r(&self, src: &Path, dst: &Path) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2019-06-09 16:57:17 -07:00
|
|
|
for f in self.read_dir(src) {
|
2018-03-27 16:06:47 +02:00
|
|
|
let path = f.path();
|
|
|
|
let name = path.file_name().unwrap();
|
|
|
|
let dst = dst.join(name);
|
|
|
|
if t!(f.file_type()).is_dir() {
|
|
|
|
t!(fs::create_dir_all(&dst));
|
|
|
|
self.cp_r(&path, &dst);
|
|
|
|
} else {
|
|
|
|
let _ = fs::remove_file(&dst);
|
|
|
|
self.copy(&path, &dst);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Copies the `src` directory recursively to `dst`. Both are assumed to exist
|
|
|
|
/// when this function is called. Unwanted files or directories can be skipped
|
|
|
|
/// by returning `false` from the filter function.
|
2018-07-10 18:10:05 +02:00
|
|
|
pub fn cp_filtered(&self, src: &Path, dst: &Path, filter: &dyn Fn(&Path) -> bool) {
|
2018-03-27 16:06:47 +02:00
|
|
|
// Immediately recurse with an empty relative path
|
|
|
|
self.recurse_(src, dst, Path::new(""), filter)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Inner function does the actual work
|
2018-07-10 18:10:05 +02:00
|
|
|
fn recurse_(&self, src: &Path, dst: &Path, relative: &Path, filter: &dyn Fn(&Path) -> bool) {
|
2018-03-27 16:06:47 +02:00
|
|
|
for f in self.read_dir(src) {
|
|
|
|
let path = f.path();
|
|
|
|
let name = path.file_name().unwrap();
|
|
|
|
let dst = dst.join(name);
|
|
|
|
let relative = relative.join(name);
|
|
|
|
// Only copy file or directory if the filter function returns true
|
|
|
|
if filter(&relative) {
|
|
|
|
if t!(f.file_type()).is_dir() {
|
|
|
|
let _ = fs::remove_dir_all(&dst);
|
|
|
|
self.create_dir(&dst);
|
|
|
|
self.recurse_(&path, &dst, &relative, filter);
|
|
|
|
} else {
|
|
|
|
let _ = fs::remove_file(&dst);
|
|
|
|
self.copy(&path, &dst);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn copy_to_folder(&self, src: &Path, dest_folder: &Path) {
|
|
|
|
let file_name = src.file_name().unwrap();
|
|
|
|
let dest = dest_folder.join(file_name);
|
|
|
|
self.copy(src, &dest);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn install(&self, src: &Path, dstdir: &Path, perms: u32) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
let dst = dstdir.join(src.file_name().unwrap());
|
2019-03-31 22:28:12 +03:00
|
|
|
self.verbose_than(1, &format!("Install {:?} to {:?}", src, dst));
|
2018-03-27 16:06:47 +02:00
|
|
|
t!(fs::create_dir_all(dstdir));
|
|
|
|
drop(fs::remove_file(&dst));
|
|
|
|
{
|
2018-10-13 23:33:10 +02:00
|
|
|
if !src.exists() {
|
|
|
|
panic!("Error: File \"{}\" not found!", src.display());
|
|
|
|
}
|
2019-01-23 17:34:43 -07:00
|
|
|
let metadata = t!(src.symlink_metadata());
|
|
|
|
if let Err(e) = fs::copy(&src, &dst) {
|
2019-12-22 17:42:04 -05:00
|
|
|
panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
|
2019-01-23 17:34:43 -07:00
|
|
|
}
|
|
|
|
t!(fs::set_permissions(&dst, metadata.permissions()));
|
|
|
|
let atime = FileTime::from_last_access_time(&metadata);
|
|
|
|
let mtime = FileTime::from_last_modification_time(&metadata);
|
|
|
|
t!(filetime::set_file_times(&dst, atime, mtime));
|
2018-03-27 16:06:47 +02:00
|
|
|
}
|
|
|
|
chmod(&dst, perms);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn create(&self, path: &Path, s: &str) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
t!(fs::write(path, s));
|
|
|
|
}
|
|
|
|
|
|
|
|
fn read(&self, path: &Path) -> String {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return String::new();
|
|
|
|
}
|
2018-04-04 07:16:25 -07:00
|
|
|
t!(fs::read_to_string(path))
|
2018-03-27 16:06:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn create_dir(&self, dir: &Path) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
t!(fs::create_dir_all(dir))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn remove_dir(&self, dir: &Path) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
t!(fs::remove_dir_all(dir))
|
|
|
|
}
|
|
|
|
|
2019-12-22 17:42:04 -05:00
|
|
|
fn read_dir(&self, dir: &Path) -> impl Iterator<Item = fs::DirEntry> {
|
2018-03-27 16:06:47 +02:00
|
|
|
let iter = match fs::read_dir(dir) {
|
|
|
|
Ok(v) => v,
|
|
|
|
Err(_) if self.config.dry_run => return vec![].into_iter(),
|
|
|
|
Err(err) => panic!("could not read dir {:?}: {:?}", dir, err),
|
|
|
|
};
|
|
|
|
iter.map(|e| t!(e)).collect::<Vec<_>>().into_iter()
|
|
|
|
}
|
2018-03-31 19:21:14 -06:00
|
|
|
|
|
|
|
fn remove(&self, f: &Path) {
|
2019-12-22 17:42:04 -05:00
|
|
|
if self.config.dry_run {
|
|
|
|
return;
|
|
|
|
}
|
2018-03-31 19:21:14 -06:00
|
|
|
fs::remove_file(f).unwrap_or_else(|_| panic!("failed to remove {:?}", f));
|
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(unix)]
|
|
|
|
fn chmod(path: &Path, perms: u32) {
|
|
|
|
use std::os::unix::fs::*;
|
|
|
|
t!(fs::set_permissions(path, fs::Permissions::from_mode(perms)));
|
2015-11-19 15:20:12 -08:00
|
|
|
}
|
2018-03-27 16:06:47 +02:00
|
|
|
#[cfg(windows)]
|
|
|
|
fn chmod(_path: &Path, _perms: u32) {}
|
|
|
|
|
2019-07-23 22:17:27 +03:00
|
|
|
impl Compiler {
|
2017-07-13 18:48:44 -06:00
|
|
|
pub fn with_stage(mut self, stage: u32) -> Compiler {
|
2017-07-05 10:20:20 -06:00
|
|
|
self.stage = stage;
|
|
|
|
self
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
|
|
|
|
2019-02-08 14:53:55 +01:00
|
|
|
/// Returns `true` if this is a snapshot compiler for `build`'s configuration
|
2017-07-05 10:46:41 -06:00
|
|
|
pub fn is_snapshot(&self, build: &Build) -> bool {
|
2017-06-27 15:59:43 -06:00
|
|
|
self.stage == 0 && self.host == build.build
|
2016-07-05 21:58:20 -07:00
|
|
|
}
|
2016-12-31 14:29:27 +08:00
|
|
|
|
2016-12-31 14:31:08 +08:00
|
|
|
/// Returns if this compiler should be treated as a final stage one in the
|
|
|
|
/// current build session.
|
|
|
|
/// This takes into account whether we're performing a full bootstrap or
|
|
|
|
/// not; don't directly compare the stage with `2`!
|
2017-07-05 10:20:20 -06:00
|
|
|
pub fn is_final_stage(&self, build: &Build) -> bool {
|
2016-12-31 14:29:27 +08:00
|
|
|
let final_stage = if build.config.full_bootstrap { 2 } else { 1 };
|
|
|
|
self.stage >= final_stage
|
|
|
|
}
|
2015-11-19 15:20:12 -08:00
|
|
|
}
|
2019-08-15 13:51:47 -07:00
|
|
|
|
|
|
|
fn envify(s: &str) -> String {
|
|
|
|
s.chars()
|
|
|
|
.map(|c| match c {
|
|
|
|
'-' => '_',
|
|
|
|
c => c,
|
|
|
|
})
|
|
|
|
.flat_map(|c| c.to_uppercase())
|
|
|
|
.collect()
|
|
|
|
}
|