Skip to content

cargo_rustc: remove workaround for fixed upstream issue #4581

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

Merged
merged 1 commit into from
Oct 10, 2017
Merged

cargo_rustc: remove workaround for fixed upstream issue #4581

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
13 changes: 4 additions & 9 deletions src/cargo/ops/cargo_rustc/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,19 +366,14 @@ fn rustc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>,
add_custom_env(&mut rustc, &build_state, &current_id, kind)?;
}

// FIXME(rust-lang/rust#18913): we probably shouldn't have to do
// this manually
for &(ref filename, ref _link_dst, _linkable) in filenames.iter() {
let mut dsts = vec![root.join(filename)];
// If there is both an rmeta and rlib, rustc will prefer to use the
// rlib, even if it is older. Therefore, we must delete the rlib to
// force using the new rmeta.
if dsts[0].extension() == Some(OsStr::new("rmeta")) {
dsts.push(root.join(filename).with_extension("rlib"));
}
for dst in &dsts {
if fs::metadata(dst).is_ok() {
fs::remove_file(dst).chain_err(|| {
if filename.extension() == Some(OsStr::new("rmeta")) {
let dst = root.join(filename).with_extension("rlib");
if dst.exists() {
fs::remove_file(&dst).chain_err(|| {
format!("Could not remove file: {}.", dst.display())
})?;
}
Expand Down