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

rustbuild: skip filecheck check if codegen tests are disabled

Browse Source 
to match the behavior of the old Makefile-based build system

closes #35752
This commit is contained in:
Jorge Aparicio 2016-08-27 17:12:37 -05:00
parent 11946956a6
commit c70d633e94
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bootstrap/config.rs
View File

@ -78,6 +78,7 @@ pub struct Config {
pub channel: String,
pub musl_root: Option<PathBuf>,
pub prefix: Option<String>,
pub codegen_tests: bool,
}
/// Per-target configuration stored in the global configuration structure.
@ -169,6 +170,7 @@ impl Config {
config.rust_codegen_units = 1;
config.build = build.to_string();
config.channel = "dev".to_string();
config.codegen_tests = true;
let toml = file.map(|file| {
let mut f = t!(File::open(&file));
@ -322,6 +324,7 @@ impl Config {
("DEBUGINFO_TESTS", self.rust_debuginfo_tests),
("LOCAL_REBUILD", self.local_rebuild),
("NINJA", self.ninja),
("CODEGEN_TESTS", self.codegen_tests),
}
match key {

2
src/bootstrap/sanity.rs
View File

@ -89,7 +89,7 @@ pub fn check(build: &mut Build) {
// Externally configured LLVM requires FileCheck to exist
let filecheck = build.llvm_filecheck(&build.config.build);
if !filecheck.starts_with(&build.out) && !filecheck.exists() {
if !filecheck.starts_with(&build.out) && !filecheck.exists() && build.config.codegen_tests {
panic!("filecheck executable {:?} does not exist", filecheck);
}