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

Include path to rustc when generating package metadata #1802

Closed
wants to merge 1 commit into from
Closed

Include path to rustc when generating package metadata #1802

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: 11 additions & 3 deletions src/cargo/ops/cargo_rustc/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,19 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
/// Get the metadata for a target in a specific profile
pub fn target_metadata(&self, pkg: &Package, target: &Target,
profile: &Profile) -> Option<Metadata> {
let metadata = target.metadata();
// When using Cargo to bootstrap the Rust compiler, we need to
// make sure that the stage1 and stage2 packages have different
// metadata. Otherwise rustc will complain about having multiple
// candidates of the same crate.
let metadata = target.metadata().map(|m| m.clone())
.map(|mut m| {
m.mix(&self.config.rustc());
m
});
if target.is_lib() && profile.test {
// Libs and their tests are built in parallel, so we need to make
// sure that their metadata is different.
metadata.map(|m| m.clone()).map(|mut m| {
metadata.map(|mut m| {
m.mix(&"test");
m
})
Expand All @@ -285,7 +293,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
// file names like `target/debug/libfoo.{a,so,rlib}` and such.
None
} else {
metadata.map(|m| m.clone())
metadata
}
}

Expand Down