Skip to content

Commit a6d099c

Browse files
committed
Mark dependencies from host directory as host deps
1 parent ec2ab8f commit a6d099c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/bootstrap/compile.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ pub fn run_cargo(
863863
// to ignore it if it's a build script.
864864
if filename.starts_with(&host_root_dir) {
865865
if crate_types.iter().any(|t| t == "proc-macro") {
866-
deps.push((filename.to_path_buf(), true));
866+
deps.push((filename.to_path_buf(), /* host_dep */ true));
867867
}
868868

869869
let is_build_script = kind == &["custom_build"]
@@ -876,7 +876,7 @@ pub fn run_cargo(
876876
// FIXME: Have Cargo explicitly indicate build-script vs proc-macro dependencies,
877877
// instead of relying on this check.
878878
if !is_build_script {
879-
deps.push((filename.to_path_buf(), false));
879+
deps.push((filename.to_path_buf(), /* host_dep */ true));
880880
}
881881
continue;
882882
}
@@ -945,8 +945,8 @@ pub fn run_cargo(
945945
deps.extend(additional_target_deps.into_iter().map(|d| (d, false)));
946946
deps.sort();
947947
let mut new_contents = Vec::new();
948-
for (dep, proc_macro) in deps.iter() {
949-
new_contents.extend(if *proc_macro { b"h" } else { b"t" });
948+
for (dep, host_dep) in deps.iter() {
949+
new_contents.extend(if *host_dep { b"h" } else { b"t" });
950950
new_contents.extend(dep.to_str().unwrap().as_bytes());
951951
new_contents.extend(b"\0");
952952
}

0 commit comments

Comments
 (0)