Skip to content

Commit

Permalink
Auto merge of #50012 - Zoxc:msvc-fix, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Don't look for cc/cxx when testing with bogus targets

This fixes test builds on Windows.

r? @Mark-Simulacrum
  • Loading branch information
bors committed Apr 17, 2018
2 parents 3809bbf + 52e1c84 commit 94516c5
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/bootstrap/sanity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,18 @@ pub fn check(build: &mut Build) {
continue;
}

cmd_finder.must_have(build.cc(*target));
if let Some(ar) = build.ar(*target) {
cmd_finder.must_have(ar);
if !build.config.dry_run {
cmd_finder.must_have(build.cc(*target));
if let Some(ar) = build.ar(*target) {
cmd_finder.must_have(ar);
}
}
}

for host in &build.hosts {
cmd_finder.must_have(build.cxx(*host).unwrap());
if !build.config.dry_run {
cmd_finder.must_have(build.cxx(*host).unwrap());
}

// The msvc hosts don't use jemalloc, turn it off globally to
// avoid packaging the dummy liballoc_jemalloc on that platform.
Expand Down

0 comments on commit 94516c5

Please sign in to comment.