Fix run-make tests running when LLVM is disabled
This commit is contained in:
parent
ffe52882ed
commit
39103ced58
|
@ -1203,17 +1203,6 @@ note: if you're sure you want to do this, please open an issue as to why. In the
|
||||||
// Only pass correct values for these flags for the `run-make` suite as it
|
// Only pass correct values for these flags for the `run-make` suite as it
|
||||||
// requires that a C++ compiler was configured which isn't always the case.
|
// requires that a C++ compiler was configured which isn't always the case.
|
||||||
if !builder.config.dry_run && matches!(suite, "run-make" | "run-make-fulldeps") {
|
if !builder.config.dry_run && matches!(suite, "run-make" | "run-make-fulldeps") {
|
||||||
cmd.arg("--cc")
|
|
||||||
.arg(builder.cc(target))
|
|
||||||
.arg("--cxx")
|
|
||||||
.arg(builder.cxx(target).unwrap())
|
|
||||||
.arg("--cflags")
|
|
||||||
.arg(builder.cflags(target, GitRepo::Rustc).join(" "));
|
|
||||||
copts_passed = true;
|
|
||||||
if let Some(ar) = builder.ar(target) {
|
|
||||||
cmd.arg("--ar").arg(ar);
|
|
||||||
}
|
|
||||||
|
|
||||||
// The llvm/bin directory contains many useful cross-platform
|
// The llvm/bin directory contains many useful cross-platform
|
||||||
// tools. Pass the path to run-make tests so they can use them.
|
// tools. Pass the path to run-make tests so they can use them.
|
||||||
let llvm_bin_path = llvm_config
|
let llvm_bin_path = llvm_config
|
||||||
|
@ -1239,6 +1228,21 @@ note: if you're sure you want to do this, please open an issue as to why. In the
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only pass correct values for these flags for the `run-make` suite as it
|
||||||
|
// requires that a C++ compiler was configured which isn't always the case.
|
||||||
|
if !builder.config.dry_run && matches!(suite, "run-make" | "run-make-fulldeps") {
|
||||||
|
cmd.arg("--cc")
|
||||||
|
.arg(builder.cc(target))
|
||||||
|
.arg("--cxx")
|
||||||
|
.arg(builder.cxx(target).unwrap())
|
||||||
|
.arg("--cflags")
|
||||||
|
.arg(builder.cflags(target, GitRepo::Rustc).join(" "));
|
||||||
|
copts_passed = true;
|
||||||
|
if let Some(ar) = builder.ar(target) {
|
||||||
|
cmd.arg("--ar").arg(ar);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if !llvm_components_passed {
|
if !llvm_components_passed {
|
||||||
cmd.arg("--llvm-components").arg("");
|
cmd.arg("--llvm-components").arg("");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue