diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-07-06 10:47:07 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-07-07 17:29:18 -0300 |
| commit | 6af1d328969dfa4d67c7bfc483e2c7c344234045 (patch) | |
| tree | 0037ff3a3bff71f1bca9854aeecad47567147711 /community/rust/bootstrap-tool-respect-tool-config.patch | |
| parent | 4a0700ff403b63d8eb3257ebdf33ca51eed294de (diff) | |
| download | aports-6af1d328969dfa4d67c7bfc483e2c7c344234045.tar.bz2 aports-6af1d328969dfa4d67c7bfc483e2c7c344234045.tar.xz | |
community/rust: upgrade to 1.36.0
* Update alpine-target.patch to fix the triplet on armhf and add the armv7 and ppc64le
triplets. This should have been done in 69851bdae1177246337f51a35734e93f1fd7e3d3,
but has been forgotten.
* Remove the following patches:
* llvm-with-ffi.patch -> only required when statically linking LLVM
* bootstrap-tool-respect-tool-config.patch -> plain outdated, not required anymore
Diffstat (limited to 'community/rust/bootstrap-tool-respect-tool-config.patch')
| -rw-r--r-- | community/rust/bootstrap-tool-respect-tool-config.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/community/rust/bootstrap-tool-respect-tool-config.patch b/community/rust/bootstrap-tool-respect-tool-config.patch deleted file mode 100644 index 958ef29e5c..0000000000 --- a/community/rust/bootstrap-tool-respect-tool-config.patch +++ /dev/null @@ -1,26 +0,0 @@ -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) { |