From 7ee27456e2684ea8fc924497c44049dd1ad15925 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 19 Nov 2019 06:15:35 +0000 Subject: Tue Nov 19 06:15:35 UTC 2019 d/rust-1.39.0-x86_64-1.txz: Upgraded. --- .../0001-WIP-minimize-the-rust-std-component.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 source/d/rust/0001-WIP-minimize-the-rust-std-component.patch (limited to 'source/d/rust/0001-WIP-minimize-the-rust-std-component.patch') diff --git a/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch b/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch new file mode 100644 index 000000000..e46a7265c --- /dev/null +++ b/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch @@ -0,0 +1,55 @@ +--- ./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)); + } + +- // We want to package up as many target libraries as possible +- // for the `rust-std` package, so if this is a host target we +- // depend on librustc and otherwise we just depend on libtest. +- if builder.hosts.iter().any(|t| t == target) { +- builder.ensure(compile::Rustc { compiler, target }); +- } else { +- builder.ensure(compile::Std { compiler, target }); +- } ++ builder.ensure(compile::Std { compiler, target }); ++ builder.ensure(compile::Rustc { compiler, target }); + + let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); + let _ = fs::remove_dir_all(&image); + +- let dst = image.join("lib/rustlib").join(target); ++ let dst = image.join("lib/rustlib").join(target).join("lib"); + t!(fs::create_dir_all(&dst)); +- let mut src = builder.sysroot_libdir(compiler, target).to_path_buf(); +- src.pop(); // Remove the trailing /lib folder from the sysroot_libdir +- builder.cp_filtered(&src, &dst, &|path| { +- if let Some(name) = path.file_name().and_then(|s| s.to_str()) { +- if name == builder.config.rust_codegen_backends_dir.as_str() { +- return false +- } +- if name == "bin" { +- return false +- } +- if name.contains("LLVM") { +- return false +- } ++ ++ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target); ++ let stamp = dbg!(compile::libstd_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())); + } +- true +- }); ++ } ++ 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())); ++ } ++ } + + let mut cmd = rust_installer(builder); + cmd.arg("generate") -- cgit v1.2.3