Skip to content

Commit 01f4534

Browse files
committed
Build rust demangler before running run-make tests
1 parent 2e7b421 commit 01f4534

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/bootstrap/test.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -1384,9 +1384,13 @@ note: if you're sure you want to do this, please open an issue as to why. In the
13841384
.arg(builder.ensure(tool::JsonDocCk { compiler: json_compiler, target }));
13851385
}
13861386

1387-
if mode == "run-make" && suite.ends_with("fulldeps") {
1387+
if mode == "run-make" {
13881388
let rust_demangler = builder
1389-
.ensure(tool::RustDemangler { compiler, target, extra_features: Vec::new() })
1389+
.ensure(tool::RustDemangler {
1390+
compiler,
1391+
target: compiler.host,
1392+
extra_features: Vec::new(),
1393+
})
13901394
.expect("in-tree tool");
13911395
cmd.arg("--rust-demangler-path").arg(rust_demangler);
13921396
}

0 commit comments

Comments
 (0)