diff options
Diffstat (limited to 'testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch')
| -rw-r--r-- | testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch b/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch index 04be717a..e46a7265 100644 --- a/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch +++ b/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch @@ -1,17 +1,6 @@ -From 2bf05f208272cd58c57f4d7d8d0e10fdb22e8719 Mon Sep 17 00:00:00 2001 -From: Josh Stone <jistone@redhat.com> -Date: Fri, 27 Sep 2019 12:33:08 -0700 -Subject: [PATCH] [WIP] minimize the rust-std component - ---- - src/bootstrap/dist.rs | 45 +++++++++++++++---------------------------- - 1 file changed, 16 insertions(+), 29 deletions(-) - -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 552965863d10..76fbd07f9fb5 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -667,41 +667,28 @@ impl Step for Std { +--- ./src/bootstrap/dist.rs.orig 2019-11-07 16:25:16.099477103 -0600 ++++ ./src/bootstrap/dist.rs 2019-11-07 16:31:36.510445625 -0600 +@@ -675,36 +675,28 @@ return distdir(builder).join(format!("{}-{}.tar.gz", name, target)); } @@ -21,15 +10,10 @@ index 552965863d10..76fbd07f9fb5 100644 - if builder.hosts.iter().any(|t| t == target) { - builder.ensure(compile::Rustc { compiler, target }); - } else { -- if builder.no_std(target) == Some(true) { -- // the `test` doesn't compile for no-std targets -- builder.ensure(compile::Std { compiler, target }); -- } else { -- builder.ensure(compile::Test { compiler, target }); -- } +- builder.ensure(compile::Std { compiler, target }); - } + builder.ensure(compile::Std { compiler, target }); -+ builder.ensure(compile::Test { compiler, target }); ++ builder.ensure(compile::Rustc { compiler, target }); let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); let _ = fs::remove_dir_all(&image); @@ -60,7 +44,7 @@ index 552965863d10..76fbd07f9fb5 100644 - true - }); + } -+ let stamp = dbg!(compile::libtest_stamp(builder, compiler_to_use, target)); ++ let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); + for (path, host) in builder.read_stamp_file(&stamp) { + if !host { + builder.copy(&path, &dst.join(path.file_name().unwrap())); @@ -69,6 +53,3 @@ index 552965863d10..76fbd07f9fb5 100644 let mut cmd = rust_installer(builder); cmd.arg("generate") --- -2.21.0 - |