66 lines
2.5 KiB
Diff
66 lines
2.5 KiB
Diff
--- rustc-1.29.2-src/src/bootstrap/dist.rs.orig 2018-10-29 06:10:51.148386100 +0300
|
|
+++ rustc-1.29.2-src/src/bootstrap/dist.rs 2018-10-29 07:45:37.437710900 +0300
|
|
@@ -189,6 +189,7 @@
|
|
}
|
|
}
|
|
|
|
+#[allow(dead_code)]
|
|
fn find_files(files: &[&str], path: &[PathBuf]) -> Vec<PathBuf> {
|
|
let mut found = Vec::with_capacity(files.len());
|
|
|
|
@@ -208,6 +209,7 @@
|
|
found
|
|
}
|
|
|
|
+#[allow(dead_code)]
|
|
fn make_win_dist(
|
|
rust_root: &Path, plat_root: &Path, target_triple: Interned<String>, builder: &Builder
|
|
) {
|
|
@@ -362,7 +364,7 @@
|
|
// thrown away (this contains the runtime DLLs included in the rustc package
|
|
// above) and the second argument is where to place all the MinGW components
|
|
// (which is what we want).
|
|
- make_win_dist(&tmpdir(builder), &image, host, &builder);
|
|
+ //make_win_dist(&tmpdir(builder), &image, host, &builder);
|
|
|
|
let mut cmd = rust_installer(builder);
|
|
cmd.arg("generate")
|
|
@@ -442,13 +444,13 @@
|
|
// anything requiring us to distribute a license, but it's likely the
|
|
// install will *also* include the rust-mingw package, which also needs
|
|
// licenses, so to be safe we just include it here in all MinGW packages.
|
|
- if host.contains("pc-windows-gnu") {
|
|
- make_win_dist(&image, &tmpdir(builder), host, builder);
|
|
+ //if host.contains("pc-windows-gnu") {
|
|
+ // make_win_dist(&image, &tmpdir(builder), host, builder);
|
|
|
|
- let dst = image.join("share/doc");
|
|
- t!(fs::create_dir_all(&dst));
|
|
- builder.cp_r(&builder.src.join("src/etc/third-party"), &dst);
|
|
- }
|
|
+ // let dst = image.join("share/doc");
|
|
+ // t!(fs::create_dir_all(&dst));
|
|
+ // builder.cp_r(&builder.src.join("src/etc/third-party"), &dst);
|
|
+ //}
|
|
|
|
// Finally, wrap everything up in a nice tarball!
|
|
let mut cmd = rust_installer(builder);
|
|
--- rustc-1.29.2-src/src/bootstrap/lib.rs.orig 2018-10-29 07:40:35.561580700 +0300
|
|
+++ rustc-1.29.2-src/src/bootstrap/lib.rs 2018-10-29 07:45:54.426140700 +0300
|
|
@@ -114,7 +114,6 @@
|
|
//! also check out the `src/bootstrap/README.md` file for more information.
|
|
|
|
#![deny(bare_trait_objects)]
|
|
-#![deny(warnings)]
|
|
#![feature(core_intrinsics)]
|
|
#![feature(drain_filter)]
|
|
|
|
@@ -1202,6 +1201,7 @@
|
|
}
|
|
}
|
|
|
|
+ #[allow(dead_code)]
|
|
fn copy_to_folder(&self, src: &Path, dest_folder: &Path) {
|
|
let file_name = src.file_name().unwrap();
|
|
let dest = dest_folder.join(file_name);
|