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.

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

Rustflags in metadata #6503

Merged
merged 6 commits into from
Jan 4, 2019
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
get types to check
  • Loading branch information
Eh2406 committed Dec 31, 2018
commit 2bf7163938d00cf86c215bbe3c79949ddcdce3d3
4 changes: 2 additions & 2 deletions src/cargo/core/compiler/context/compilation_files.rs
Original file line number Diff line number Diff line change
@@ -497,9 +497,9 @@ fn compute_metadata<'a, 'cfg>(
// This helps when the target directory is a shared cache for projects with different cargo configs,
// or if the user is experimenting with different rustflags manually.
if unit.mode.is_doc() {
cx.bcx.rustdocflags_args(unit).hash(&mut hasher);
cx.bcx.rustdocflags_args(unit).ok().hash(&mut hasher);
} else {
cx.bcx.rustflags_args(unit).hash(&mut hasher);
cx.bcx.rustflags_args(unit).ok().hash(&mut hasher);
}

// Artifacts compiled for the host should have a different metadata