OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move cargo() to Builder

Browse Source
This commit is contained in:
Mark Simulacrum 2017-07-05 11:14:54 -06:00
parent 276090e870
commit 7db49fb467
2 changed files with 43 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/bootstrap/builder.rs
View File

@ -261,68 +261,61 @@ impl<'a> Builder<'a> {
/// rustc compiler, its output will be scoped by `mode`'s output directory, /// rustc compiler, its output will be scoped by `mode`'s output directory,
/// it will pass the `--target` flag for the specified `target`, and will be /// it will pass the `--target` flag for the specified `target`, and will be
/// executing the Cargo command `cmd`. /// executing the Cargo command `cmd`.
pub fn cargo(&self, compiler: Compiler, mode: Mode, target: &str, cmd: &str) -> Command { fn cargo(&self,
let build = self.build; compiler: Compiler,
mode: Mode,
// Clear out the output we're about to generate if our compiler changed target: &str,
{ cmd: &str) -> Command {
let out_dir = build.cargo_out(compiler, mode, target); let mut cargo = Command::new(&self.initial_cargo);
build.clear_if_dirty(&out_dir, &self.rustc(compiler)); let out_dir = self.stage_out(compiler, mode);
}
let mut cargo = Command::new(&build.initial_cargo);
let out_dir = build.stage_out(compiler, mode);
cargo.env("CARGO_TARGET_DIR", out_dir) cargo.env("CARGO_TARGET_DIR", out_dir)
.arg(cmd) .arg(cmd)
.arg("-j").arg(build.jobs().to_string()) .arg("-j").arg(self.jobs().to_string())
.arg("--target").arg(target); .arg("--target").arg(target);
// FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005 // FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
// Force cargo to output binaries with disambiguating hashes in the name // Force cargo to output binaries with disambiguating hashes in the name
cargo.env("__CARGO_DEFAULT_LIB_METADATA", &self.build.config.channel); cargo.env("__CARGO_DEFAULT_LIB_METADATA", &self.config.channel);
let stage; let stage;
if compiler.stage == 0 && build.local_rebuild { if compiler.stage == 0 && self.local_rebuild {
// Assume the local-rebuild rustc already has stage1 features. // Assume the local-rebuild rustc already has stage1 features.
stage = 1; stage = 1;
} else { } else {
stage = compiler.stage; stage = compiler.stage;
} }
self.build.verbose(&format!("cargo using: {:?}", self.rustc(compiler)));
// Customize the compiler we're running. Specify the compiler to cargo // Customize the compiler we're running. Specify the compiler to cargo
// as our shim and then pass it some various options used to configure // as our shim and then pass it some various options used to configure
// how the actual compiler itbuild is called. // how the actual compiler itself is called.
// //
// These variables are primarily all read by // These variables are primarily all read by
// src/bootstrap/bin/{rustc.rs,rustdoc.rs} // src/bootstrap/bin/{rustc.rs,rustdoc.rs}
cargo.env("RUSTBUILD_NATIVE_DIR", build.native_dir(target)) cargo.env("RUSTBUILD_NATIVE_DIR", self.native_dir(target))
.env("RUSTC", build.out.join("bootstrap/debug/rustc")) .env("RUSTC", self.out.join("bootstrap/debug/rustc"))
.env("RUSTC_REAL", self.rustc(compiler)) .env("RUSTC_REAL", self.compiler_path(compiler))
.env("RUSTC_STAGE", stage.to_string()) .env("RUSTC_STAGE", stage.to_string())
.env("RUSTC_CODEGEN_UNITS", .env("RUSTC_CODEGEN_UNITS",
build.config.rust_codegen_units.to_string()) self.config.rust_codegen_units.to_string())
.env("RUSTC_DEBUG_ASSERTIONS", .env("RUSTC_DEBUG_ASSERTIONS",
build.config.rust_debug_assertions.to_string()) self.config.rust_debug_assertions.to_string())
.env("RUSTC_SYSROOT", self.sysroot(compiler)) .env("RUSTC_SYSROOT", self.sysroot(compiler))
.env("RUSTC_LIBDIR", self.rustc_libdir(compiler)) .env("RUSTC_LIBDIR", self.rustc_libdir(compiler))
.env("RUSTC_RPATH", build.config.rust_rpath.to_string()) .env("RUSTC_RPATH", self.config.rust_rpath.to_string())
.env("RUSTDOC", build.out.join("bootstrap/debug/rustdoc")) .env("RUSTDOC", self.out.join("bootstrap/debug/rustdoc"))
.env("RUSTDOC_REAL", self.rustdoc(compiler)) .env("RUSTDOC_REAL", self.rustdoc(compiler))
.env("RUSTC_FLAGS", build.rustc_flags(target).join(" ")); .env("RUSTC_FLAGS", self.rustc_flags(target).join(" "));
if mode != Mode::Tool { if mode != Mode::Tool {
// Tools don't get debuginfo right now, e.g. cargo and rls don't // Tools don't get debuginfo right now, e.g. cargo and rls don't
// get compiled with debuginfo. // get compiled with debuginfo.
cargo.env("RUSTC_DEBUGINFO", build.config.rust_debuginfo.to_string()) cargo.env("RUSTC_DEBUGINFO", self.config.rust_debuginfo.to_string())
.env("RUSTC_DEBUGINFO_LINES", build.config.rust_debuginfo_lines.to_string()) .env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string())
.env("RUSTC_FORCE_UNSTABLE", "1"); .env("RUSTC_FORCE_UNSTABLE", "1");
// Currently the compiler depends on crates from crates.io, and // Currently the compiler depends on crates from crates.io, and
// then other crates can depend on the compiler (e.g. proc-macro // then other crates can depend on the compiler (e.g. proc-macro
// crates). Let's say, for example that rustc itbuild depends on the // crates). Let's say, for example that rustc itself depends on the
// bitflags crate. If an external crate then depends on the // bitflags crate. If an external crate then depends on the
// bitflags crate as well, we need to make sure they don't // bitflags crate as well, we need to make sure they don't
// conflict, even if they pick the same verison of bitflags. We'll // conflict, even if they pick the same verison of bitflags. We'll
@ -341,58 +334,58 @@ impl<'a> Builder<'a> {
// Enable usage of unstable features // Enable usage of unstable features
cargo.env("RUSTC_BOOTSTRAP", "1"); cargo.env("RUSTC_BOOTSTRAP", "1");
build.add_rust_test_threads(&mut cargo); self.add_rust_test_threads(&mut cargo);
// Almost all of the crates that we compile as part of the bootstrap may // Almost all of the crates that we compile as part of the bootstrap may
// have a build script, including the standard library. To compile a // have a build script, including the standard library. To compile a
// build script, however, it itbuild needs a standard library! This // build script, however, it itself needs a standard library! This
// introduces a bit of a pickle when we're compiling the standard // introduces a bit of a pickle when we're compiling the standard
// library itbuild. // library itself.
// //
// To work around this we actually end up using the snapshot compiler // To work around this we actually end up using the snapshot compiler
// (stage0) for compiling build scripts of the standard library itbuild. // (stage0) for compiling build scripts of the standard library itself.
// The stage0 compiler is guaranteed to have a libstd available for use. // The stage0 compiler is guaranteed to have a libstd available for use.
// //
// For other crates, however, we know that we've already got a standard // For other crates, however, we know that we've already got a standard
// library up and running, so we can use the normal compiler to compile // library up and running, so we can use the normal compiler to compile
// build scripts in that situation. // build scripts in that situation.
if mode == Mode::Libstd { if mode == Mode::Libstd {
cargo.env("RUSTC_SNAPSHOT", &build.initial_rustc) cargo.env("RUSTC_SNAPSHOT", &self.initial_rustc)
.env("RUSTC_SNAPSHOT_LIBDIR", build.rustc_snapshot_libdir()); .env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_snapshot_libdir());
} else { } else {
cargo.env("RUSTC_SNAPSHOT", self.rustc(compiler)) cargo.env("RUSTC_SNAPSHOT", self.compiler_path(compiler))
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_libdir(compiler)); .env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_libdir(compiler));
} }
// Ignore incremental modes except for stage0, since we're // Ignore incremental modes except for stage0, since we're
// not guaranteeing correctness across builds if the compiler // not guaranteeing correctness across builds if the compiler
// is changing under your feet.` // is changing under your feet.`
if build.flags.incremental && compiler.stage == 0 { if self.flags.incremental && compiler.stage == 0 {
let incr_dir = build.incremental_dir(compiler); let incr_dir = self.incremental_dir(compiler);
cargo.env("RUSTC_INCREMENTAL", incr_dir); cargo.env("RUSTC_INCREMENTAL", incr_dir);
} }
if let Some(ref on_fail) = build.flags.on_fail { if let Some(ref on_fail) = self.flags.on_fail {
cargo.env("RUSTC_ON_FAIL", on_fail); cargo.env("RUSTC_ON_FAIL", on_fail);
} }
cargo.env("RUSTC_VERBOSE", format!("{}", build.verbosity)); cargo.env("RUSTC_VERBOSE", format!("{}", self.verbosity));
// Specify some various options for build scripts used throughout // Specify some various options for build scripts used throughout
// the build. // the build.
// //
// FIXME: the guard against msvc shouldn't need to be here // FIXME: the guard against msvc shouldn't need to be here
if !target.contains("msvc") { if !target.contains("msvc") {
cargo.env(format!("CC_{}", target), build.cc(target)) cargo.env(format!("CC_{}", target), self.cc(target))
.env(format!("AR_{}", target), build.ar(target).unwrap()) // only msvc is None .env(format!("AR_{}", target), self.ar(target).unwrap()) // only msvc is None
.env(format!("CFLAGS_{}", target), build.cflags(target).join(" ")); .env(format!("CFLAGS_{}", target), self.cflags(target).join(" "));
if let Ok(cxx) = build.cxx(target) { if let Ok(cxx) = self.cxx(target) {
cargo.env(format!("CXX_{}", target), cxx); cargo.env(format!("CXX_{}", target), cxx);
} }
} }
if build.config.extended && compiler.is_final_stage(self) { if mode == Mode::Libstd && self.config.extended && compiler.is_final_stage(self) {
cargo.env("RUSTC_SAVE_ANALYSIS", "api".to_string()); cargo.env("RUSTC_SAVE_ANALYSIS", "api".to_string());
} }
@ -414,21 +407,21 @@ impl<'a> Builder<'a> {
// FIXME: should update code to not require this env var // FIXME: should update code to not require this env var
cargo.env("CFG_COMPILER_HOST_TRIPLE", target); cargo.env("CFG_COMPILER_HOST_TRIPLE", target);
if build.is_verbose() { if self.is_verbose() {
cargo.arg("-v"); cargo.arg("-v");
} }
// FIXME: cargo bench does not accept `--release` // FIXME: cargo bench does not accept `--release`
if build.config.rust_optimize && cmd != "bench" { if self.config.rust_optimize && cmd != "bench" {
cargo.arg("--release"); cargo.arg("--release");
} }
if build.config.locked_deps { if self.config.locked_deps {
cargo.arg("--locked"); cargo.arg("--locked");
} }
if build.config.vendor || build.is_sudo { if self.config.vendor || self.is_sudo {
cargo.arg("--frozen"); cargo.arg("--frozen");
} }
build.ci_env.force_coloring_in_ci(&mut cargo); self.ci_env.force_coloring_in_ci(&mut cargo);
cargo cargo
} }

174
src/bootstrap/lib.rs
View File

@ -352,180 +352,6 @@ impl Build {
t!(File::create(stamp)); t!(File::create(stamp));
} }
/// Prepares an invocation of `cargo` to be run.
///
/// This will create a `Command` that represents a pending execution of
/// Cargo. This cargo will be configured to use `compiler` as the actual
/// rustc compiler, its output will be scoped by `mode`'s output directory,
/// it will pass the `--target` flag for the specified `target`, and will be
/// executing the Cargo command `cmd`.
fn cargo(&self,
compiler: Compiler,
mode: Mode,
target: &str,
cmd: &str) -> Command {
let mut cargo = Command::new(&self.initial_cargo);
let out_dir = self.stage_out(compiler, mode);
cargo.env("CARGO_TARGET_DIR", out_dir)
.arg(cmd)
.arg("-j").arg(self.jobs().to_string())
.arg("--target").arg(target);
// FIXME: Temporary fix for https://github.com/rust-lang/cargo/issues/3005
// Force cargo to output binaries with disambiguating hashes in the name
cargo.env("__CARGO_DEFAULT_LIB_METADATA", &self.config.channel);
let stage;
if compiler.stage == 0 && self.local_rebuild {
// Assume the local-rebuild rustc already has stage1 features.
stage = 1;
} else {
stage = compiler.stage;
}
// Customize the compiler we're running. Specify the compiler to cargo
// as our shim and then pass it some various options used to configure
// how the actual compiler itself is called.
//
// These variables are primarily all read by
// src/bootstrap/bin/{rustc.rs,rustdoc.rs}
cargo.env("RUSTBUILD_NATIVE_DIR", self.native_dir(target))
.env("RUSTC", self.out.join("bootstrap/debug/rustc"))
.env("RUSTC_REAL", self.compiler_path(compiler))
.env("RUSTC_STAGE", stage.to_string())
.env("RUSTC_CODEGEN_UNITS",
self.config.rust_codegen_units.to_string())
.env("RUSTC_DEBUG_ASSERTIONS",
self.config.rust_debug_assertions.to_string())
.env("RUSTC_SYSROOT", self.sysroot(compiler))
.env("RUSTC_LIBDIR", self.rustc_libdir(compiler))
.env("RUSTC_RPATH", self.config.rust_rpath.to_string())
.env("RUSTDOC", self.out.join("bootstrap/debug/rustdoc"))
.env("RUSTDOC_REAL", self.rustdoc(compiler))
.env("RUSTC_FLAGS", self.rustc_flags(target).join(" "));
if mode != Mode::Tool {
// Tools don't get debuginfo right now, e.g. cargo and rls don't
// get compiled with debuginfo.
cargo.env("RUSTC_DEBUGINFO", self.config.rust_debuginfo.to_string())
.env("RUSTC_DEBUGINFO_LINES", self.config.rust_debuginfo_lines.to_string())
.env("RUSTC_FORCE_UNSTABLE", "1");
// Currently the compiler depends on crates from crates.io, and
// then other crates can depend on the compiler (e.g. proc-macro
// crates). Let's say, for example that rustc itself depends on the
// bitflags crate. If an external crate then depends on the
// bitflags crate as well, we need to make sure they don't
// conflict, even if they pick the same verison of bitflags. We'll
// want to make sure that e.g. a plugin and rustc each get their
// own copy of bitflags.
// Cargo ensures that this works in general through the -C metadata
// flag. This flag will frob the symbols in the binary to make sure
// they're different, even though the source code is the exact
// same. To solve this problem for the compiler we extend Cargo's
// already-passed -C metadata flag with our own. Our rustc.rs
// wrapper around the actual rustc will detect -C metadata being
// passed and frob it with this extra string we're passing in.
cargo.env("RUSTC_METADATA_SUFFIX", "rustc");
}
// Enable usage of unstable features
cargo.env("RUSTC_BOOTSTRAP", "1");
self.add_rust_test_threads(&mut cargo);
// Almost all of the crates that we compile as part of the bootstrap may
// have a build script, including the standard library. To compile a
// build script, however, it itself needs a standard library! This
// introduces a bit of a pickle when we're compiling the standard
// library itself.
//
// To work around this we actually end up using the snapshot compiler
// (stage0) for compiling build scripts of the standard library itself.
// The stage0 compiler is guaranteed to have a libstd available for use.
//
// For other crates, however, we know that we've already got a standard
// library up and running, so we can use the normal compiler to compile
// build scripts in that situation.
if mode == Mode::Libstd {
cargo.env("RUSTC_SNAPSHOT", &self.initial_rustc)
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_snapshot_libdir());
} else {
cargo.env("RUSTC_SNAPSHOT", self.compiler_path(compiler))
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_libdir(compiler));
}
// Ignore incremental modes except for stage0, since we're
// not guaranteeing correctness across builds if the compiler
// is changing under your feet.`
if self.flags.incremental && compiler.stage == 0 {
let incr_dir = self.incremental_dir(compiler);
cargo.env("RUSTC_INCREMENTAL", incr_dir);
}
if let Some(ref on_fail) = self.flags.on_fail {
cargo.env("RUSTC_ON_FAIL", on_fail);
}
cargo.env("RUSTC_VERBOSE", format!("{}", self.verbosity));
// Specify some various options for build scripts used throughout
// the build.
//
// FIXME: the guard against msvc shouldn't need to be here
if !target.contains("msvc") {
cargo.env(format!("CC_{}", target), self.cc(target))
.env(format!("AR_{}", target), self.ar(target).unwrap()) // only msvc is None
.env(format!("CFLAGS_{}", target), self.cflags(target).join(" "));
if let Ok(cxx) = self.cxx(target) {
cargo.env(format!("CXX_{}", target), cxx);
}
}
if mode == Mode::Libstd &&
self.config.extended &&
compiler.is_final_stage(self) {
cargo.env("RUSTC_SAVE_ANALYSIS", "api".to_string());
}
// When being built Cargo will at some point call `nmake.exe` on Windows
// MSVC. Unfortunately `nmake` will read these two environment variables
// below and try to intepret them. We're likely being run, however, from
// MSYS `make` which uses the same variables.
//
// As a result, to prevent confusion and errors, we remove these
// variables from our environment to prevent passing MSYS make flags to
// nmake, causing it to blow up.
if cfg!(target_env = "msvc") {
cargo.env_remove("MAKE");
cargo.env_remove("MAKEFLAGS");
}
// Environment variables *required* throughout the build
//
// FIXME: should update code to not require this env var
cargo.env("CFG_COMPILER_HOST_TRIPLE", target);
if self.is_verbose() {
cargo.arg("-v");
}
// FIXME: cargo bench does not accept `--release`
if self.config.rust_optimize && cmd != "bench" {
cargo.arg("--release");
}
if self.config.locked_deps {
cargo.arg("--locked");
}
if self.config.vendor || self.is_sudo {
cargo.arg("--frozen");
}
self.ci_env.force_coloring_in_ci(&mut cargo);
cargo
}
/// Get a path to the compiler specified. /// Get a path to the compiler specified.
fn compiler_path(&self, compiler: Compiler) -> PathBuf { fn compiler_path(&self, compiler: Compiler) -> PathBuf {
if compiler.is_snapshot(self) { if compiler.is_snapshot(self) {