Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc: Check --dep-info target path #13627

Closed
wants to merge 1 commit into from
Closed

rustc: Check --dep-info target path #13627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/librustc/driver/driver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,14 @@ fn write_out_deps(sess: &Session,
_ => return Ok(()),
};

// Check that the directory exists and the target is not a directory
if !deps_filename.dir_path().exists() {
sess.fatal("directory specified by --dep-info does not exist.");
}
if deps_filename.is_dir() {
sess.fatal("file specified by --dep-info is a directory.");
}

// Build a list of files used to compile the output and
// write Makefile-compatible dependency rules
let files: Vec<~str> = sess.codemap().files.borrow()
Expand Down Expand Up @@ -575,7 +583,11 @@ pub fn compile_input(sess: Session, cfg: ast::CrateConfig, input: &Input,
krate, &id);
(outputs, expanded_crate, ast_map)
};
write_out_deps(&sess, input, &outputs, &expanded_crate).unwrap();
let r = write_out_deps(&sess, input, &outputs, &expanded_crate);
match r {
Err(e) => fail!("writing dependencies failed due to {}", e),
_ => r.unwrap(),
}

if stop_after_phase_2(&sess) { return; }

Expand Down