Skip to content

Commit

Permalink
Override linker in cargotest on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron1011 committed Oct 24, 2022
1 parent ecc5d26 commit 541128d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/tools/cargotest/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ fn run_cargo_test(
.env("CFG_DISABLE_CROSS_TESTS", "1")
// Relax #![deny(warnings)] in some crates
.env("RUSTFLAGS", "--cap-lints warn")
// servo tries to use 'lld-link.exe' on windows, but we don't
// have lld on our PATH in CI. Override it to use 'link.exe'
.env("CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER", "link.exe")
.env("CARGO_TARGET_I686_PC_WINDOWS_MSVC_LINKER", "link.exe")
.current_dir(crate_path)
.status()
.unwrap();
Expand Down

0 comments on commit 541128d

Please sign in to comment.