diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-28 13:38:06 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-29 14:16:41 -0800 |
| commit | 1747ce25ad122e1b330eeb1eaf4e2d67f10b355d (patch) | |
| tree | 71b78ecd424e16aa1055f1686550e2d88fc91628 /src/bootstrap/compile.rs | |
| parent | 4be49e1937e25cc9c78d7758e095046563052dec (diff) | |
| download | rust-1747ce25ad122e1b330eeb1eaf4e2d67f10b355d.tar.gz rust-1747ce25ad122e1b330eeb1eaf4e2d67f10b355d.zip | |
Add support for test suites emulated in QEMU
This commit adds support to the build system to execute test suites that cannot run natively but can instead run inside of a QEMU emulator. A proof-of-concept builder was added for the `arm-unknown-linux-gnueabihf` target to show off how this might work. In general the architecture is to have a server running inside of the emulator which a local client connects to. The protocol between the server/client supports compiling tests on the host and running them on the target inside the emulator. Closes #33114
Diffstat (limited to 'src/bootstrap/compile.rs')
| -rw-r--r-- | src/bootstrap/compile.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 7c35151a6d2..398ca1b2f22 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -382,10 +382,10 @@ fn add_to_sysroot(out_dir: &Path, sysroot_dst: &Path) { /// /// This will build the specified tool with the specified `host` compiler in /// `stage` into the normal cargo output directory. -pub fn tool(build: &Build, stage: u32, host: &str, tool: &str) { - println!("Building stage{} tool {} ({})", stage, tool, host); +pub fn tool(build: &Build, stage: u32, target: &str, tool: &str) { + println!("Building stage{} tool {} ({})", stage, tool, target); - let compiler = Compiler::new(stage, host); + let compiler = Compiler::new(stage, &build.config.build); // FIXME: need to clear out previous tool and ideally deps, may require // isolating output directories or require a pseudo shim step to @@ -396,7 +396,7 @@ pub fn tool(build: &Build, stage: u32, host: &str, tool: &str) { // let out_dir = build.cargo_out(stage, &host, Mode::Librustc, target); // build.clear_if_dirty(&out_dir, &libstd_stamp(build, stage, &host, target)); - let mut cargo = build.cargo(&compiler, Mode::Tool, host, "build"); + let mut cargo = build.cargo(&compiler, Mode::Tool, target, "build"); cargo.arg("--manifest-path") .arg(build.src.join(format!("src/tools/{}/Cargo.toml", tool))); |
