mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-26 08:51:25 +02:00
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
From: Jakub Jirutka <jakub@jirutka.cz>
|
|
Date: Sun, 20 May 2018 14:58:00 +0200
|
|
Subject: [PATCH] Fix tool builder to respect build.tools config
|
|
|
|
--- a/src/bootstrap/tool.rs
|
|
+++ b/src/bootstrap/tool.rs
|
|
@@ -464,7 +464,8 @@
|
|
|
|
fn should_run(run: ShouldRun) -> ShouldRun {
|
|
let builder = run.builder;
|
|
- run.path("src/tools/cargo").default_condition(builder.config.extended)
|
|
+ run.path("src/tools/cargo").default_condition(builder.config.extended
|
|
+ && builder.config.tools.as_ref().map_or(true, |t| t.contains("cargo")))
|
|
}
|
|
|
|
fn make_run(run: RunConfig) {
|
|
@@ -518,7 +519,8 @@
|
|
|
|
fn should_run(run: ShouldRun) -> ShouldRun {
|
|
let builder = run.builder;
|
|
- run.path($path).default_condition(builder.config.extended)
|
|
+ run.path($path).default_condition(builder.config.extended
|
|
+ && builder.config.tools.as_ref().map_or(true, |t| t.contains($tool_name)))
|
|
}
|
|
|
|
fn make_run(run: RunConfig) {
|