diff options
| author | oliver-giersch <oliver.giersch@googlemail.com> | 2018-10-15 14:38:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-15 14:38:34 +0200 |
| commit | 30bfdc872020c6addcb2ea488b2a6dbdd5ef355a (patch) | |
| tree | 9c2ccdcdd23848de81e3cbf54be11ea029ba1614 /src/bootstrap | |
| parent | 3527d1d5298fafe6d9e480f95e47f970f1b3adc1 (diff) | |
| parent | 5891a64165ea4819ca331f5a35f5318a91e1be3f (diff) | |
| download | rust-30bfdc872020c6addcb2ea488b2a6dbdd5ef355a.tar.gz rust-30bfdc872020c6addcb2ea488b2a6dbdd5ef355a.zip | |
Merge pull request #5 from oliver-giersch/master
sync with upstream
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/dist.rs | 6 | ||||
| -rw-r--r-- | src/bootstrap/lib.rs | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index c25f94357f2..cf79d4f777a 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1263,14 +1263,16 @@ impl Step for Clippy { builder.install(&cargoclippy, &image.join("bin"), 0o755); let doc = image.join("share/doc/clippy"); builder.install(&src.join("README.md"), &doc, 0o644); - builder.install(&src.join("LICENSE"), &doc, 0o644); + builder.install(&src.join("LICENSE-APACHE"), &doc, 0o644); + builder.install(&src.join("LICENSE-MIT"), &doc, 0o644); // Prepare the overlay let overlay = tmp.join("clippy-overlay"); drop(fs::remove_dir_all(&overlay)); t!(fs::create_dir_all(&overlay)); builder.install(&src.join("README.md"), &overlay, 0o644); - builder.install(&src.join("LICENSE"), &doc, 0o644); + builder.install(&src.join("LICENSE-APACHE"), &doc, 0o644); + builder.install(&src.join("LICENSE-MIT"), &doc, 0o644); builder.create(&overlay.join("version"), &version); // Generate the installer tarball diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 247727762d1..c09de02ab51 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -1288,6 +1288,9 @@ impl Build { t!(fs::create_dir_all(dstdir)); drop(fs::remove_file(&dst)); { + if !src.exists() { + panic!("Error: File \"{}\" not found!", src.display()); + } let mut s = t!(fs::File::open(&src)); let mut d = t!(fs::File::create(&dst)); io::copy(&mut s, &mut d).expect("failed to copy"); |