diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2018-06-16 18:46:54 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2018-07-07 10:51:54 +0200 |
| commit | d7bc2937464b760d69ae8fc1146b660dc867e802 (patch) | |
| tree | e5960fdaf2e30a58fc6883a3cd56d791cd470b62 | |
| parent | f44ec6439b31caa92ee394f65aae7d4a1a5341dd (diff) | |
| download | rust-d7bc2937464b760d69ae8fc1146b660dc867e802.tar.gz rust-d7bc2937464b760d69ae8fc1146b660dc867e802.zip | |
Solve review comment
| -rw-r--r-- | src/bootstrap/compile.rs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index e23566d52f0..524df9587da 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -645,14 +645,13 @@ impl Step for CodegenBackend { fn make_run(run: RunConfig) { let backend = run.builder.config.rust_codegen_backends.get(0); - let backend = backend.cloned().unwrap_or_else(|| { - INTERNER.intern_str("llvm") - }); - run.builder.ensure(CodegenBackend { - compiler: run.builder.compiler(run.builder.top_stage, run.host), - target: run.target, - backend, - }); + if let Some(backend) = backend.cloned() { + run.builder.ensure(CodegenBackend { + compiler: run.builder.compiler(run.builder.top_stage, run.host), + target: run.target, + backend, + }); + } } fn run(self, builder: &Builder) { @@ -677,9 +676,7 @@ impl Step for CodegenBackend { .arg(builder.src.join("src/librustc_codegen_llvm/Cargo.toml")); rustc_cargo_env(builder, &mut cargo); - if !backend.is_empty() { - features += &build_codegen_backend(&builder, &mut cargo, &compiler, target, backend); - } + features += &build_codegen_backend(&builder, &mut cargo, &compiler, target, backend); let tmp_stamp = builder.cargo_out(compiler, Mode::Codegen, target) .join(".tmp.stamp"); |
