nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 11:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #77829 - gburgessiv:unused-features-var, r=alexcrichton

Browse Source 
bootstrap: only use compiler-builtins-c if they exist

The assignment of `features` above was added in rust-lang#60981, but
never used. Presumably the intent was to replace the string literal here
with it.

While I'm in the area, `compiler_builtins_c_feature` doesn't need to be
a `String`.

I'm not entirely sure of a great way to locally test this -- `./x.py test`
passed on my machine, but 🤷‍♂️.

r? @alexcrichton
This commit is contained in:
Dylan DPC 2020-10-14 02:30:44 +02:00 committed by GitHub
commit 31799bade5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bootstrap/compile.rs
View File

@ -234,14 +234,14 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
// Note that `libprofiler_builtins/build.rs` also computes this so if // Note that `libprofiler_builtins/build.rs` also computes this so if
// you're changing something here please also change that. // you're changing something here please also change that.
cargo.env("RUST_COMPILER_RT_ROOT", &compiler_builtins_root); cargo.env("RUST_COMPILER_RT_ROOT", &compiler_builtins_root);
" compiler-builtins-c".to_string() " compiler-builtins-c"
} else { } else {
String::new() ""
}; };
if builder.no_std(target) == Some(true) { if builder.no_std(target) == Some(true) {
let mut features = "compiler-builtins-mem".to_string(); let mut features = "compiler-builtins-mem".to_string();
features.push_str(&compiler_builtins_c_feature); features.push_str(compiler_builtins_c_feature);
// for no-std targets we only compile a few no_std crates // for no-std targets we only compile a few no_std crates
cargo cargo
@ -249,10 +249,10 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
.arg("--manifest-path") .arg("--manifest-path")
.arg(builder.src.join("library/alloc/Cargo.toml")) .arg(builder.src.join("library/alloc/Cargo.toml"))
.arg("--features") .arg("--features")
.arg("compiler-builtins-mem compiler-builtins-c"); .arg(features);
} else { } else {
let mut features = builder.std_features(); let mut features = builder.std_features();
features.push_str(&compiler_builtins_c_feature); features.push_str(compiler_builtins_c_feature);
cargo cargo
.arg("--features") .arg("--features")