Skip to content

Commit 77b4058

Browse files
committed
Auto merge of #8421 - alexcrichton:read-env-dep, r=ehuss
Parse `# env-dep` directives in dep-info files This commit updates Cargo's parsing of rustc's dep-info files to account for changes made upstream in rust-lang/rust#71858. This means that if `env!` or `option_env!` is used in crate files Cargo will correctly rebuild the crate if the env var changes. Closes #8417
2 parents f12d72e + 0750a6f commit 77b4058

File tree

7 files changed

+461
-112
lines changed

7 files changed

+461
-112
lines changed

src/cargo/core/compiler/context/compilation_files.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ fn compute_metadata(
490490
// cause a new hash due to the rustc version changing, but this allows
491491
// cargo to be extra careful to deal with different versions of cargo that
492492
// use the same rustc version.
493-
1.hash(&mut hasher);
493+
2.hash(&mut hasher);
494494

495495
// Unique metadata per (name, source, version) triple. This'll allow us
496496
// to pull crates from anywhere without worrying about conflicts.

0 commit comments

Comments
 (0)