]> git.lizzy.rs Git - rust.git/commitdiff
Notice non-toplevel dll dependencies in rustbuild
authorMark Simulacrum <mark.simulacrum@gmail.com>
Thu, 28 Jun 2018 16:06:42 +0000 (10:06 -0600)
committerAlex Crichton <alex@alexcrichton.com>
Sat, 30 Jun 2018 20:17:49 +0000 (13:17 -0700)
Previously Cargo would hardlink all the dependencies into the "root" as
foo.dll and the `toplevel` array would get populated with these, but
that's no longer the case. Instead, cargo will only do this for the
final artifacts/final libraries.

Rustbuild is updated to continue looping through the artifacts mentioned
instead of early-returning. This should fix the bug.

@alexcrichton found the cause of this and suggested this fix.

src/bootstrap/compile.rs

index 11d9154ba696c9db0965165ce2dfc4bec5d475c8..642f22b11ade36aac997d5d2266624f16f5344d7 100644 (file)
@@ -1049,7 +1049,7 @@ pub fn run_cargo(builder: &Builder, cargo: &mut Command, stamp: &Path, is_check:
                !filename.ends_with(".lib") &&
                !is_dylib(&filename) &&
                !(is_check && filename.ends_with(".rmeta")) {
-                return;
+                continue;
             }
 
             let filename = Path::new(&*filename);
@@ -1057,14 +1057,14 @@ pub fn run_cargo(builder: &Builder, cargo: &mut Command, stamp: &Path, is_check:
             // If this was an output file in the "host dir" we don't actually
             // worry about it, it's not relevant for us.
             if filename.starts_with(&host_root_dir) {
-                return;
+                continue;
             }
 
             // If this was output in the `deps` dir then this is a precise file
             // name (hash included) so we start tracking it.
             if filename.starts_with(&target_deps_dir) {
                 deps.push(filename.to_path_buf());
-                return;
+                continue;
             }
 
             // Otherwise this was a "top level artifact" which right now doesn't