nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-24 21:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Provide bootstrap tools with RUSTC in environment

Browse Source
This commit is contained in:
Mark Rousskov 2020-09-10 10:17:32 -04:00
parent a625ab77e8
commit 1aac99de25
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/test.rs
View File

@ -1281,6 +1281,8 @@ impl Step for Compiletest {
cmd.arg("--rustfix-coverage");
}
cmd.env("BOOTSTRAP_CARGO", &builder.initial_cargo);
builder.ci_env.force_coloring_in_ci(&mut cmd);
builder.info(&format!(

4
src/bootstrap/tool.rs
View File

@ -700,6 +700,10 @@ impl<'a> Builder<'a> {
}
add_dylib_path(lib_paths, &mut cmd);
// Provide a RUSTC for this command to use.
cmd.env("RUSTC", &self.initial_rustc);
cmd
}
}

2
src/test/run-make/thumb-none-cortex-m/Makefile
View File

@ -35,4 +35,4 @@ all:
# HACK(eddyb) sets `RUSTC_BOOTSTRAP=1` so Cargo can accept nightly features.
# These come from the top-level Rust workspace, that this crate is not a
# member of, but Cargo tries to load the workspace `Cargo.toml` anyway.
cd $(WORK_DIR) && cd $(CRATE) && env RUSTC_BOOTSTRAP=1 $(CARGO) build --target $(TARGET) -v
cd $(WORK_DIR) && cd $(CRATE) && env RUSTC_BOOTSTRAP=1 $(BOOTSTRAP_CARGO) build --target $(TARGET) -v

4
src/test/run-make/thumb-none-qemu/script.sh
View File

@ -12,8 +12,8 @@ pushd $WORK_DIR
# These come from the top-level Rust workspace, that this crate is not a
# member of, but Cargo tries to load the workspace `Cargo.toml` anyway.
env RUSTC_BOOTSTRAP=1 RUSTFLAGS="-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x" \
$CARGO run --target $TARGET | grep "x = 42"
$BOOTSTRAP_CARGO run --target $TARGET | grep "x = 42"
env RUSTC_BOOTSTRAP=1 RUSTFLAGS="-C linker=arm-none-eabi-ld -C link-arg=-Tlink.x" \
$CARGO run --target $TARGET --release | grep "x = 42"
$BOOTSTRAP_CARGO run --target $TARGET --release | grep "x = 42"
popd
popd