Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only apply ProceduralMasquerade hack to older versions of rental #94063

Merged
merged 3 commits into from
Oct 24, 2022
Merged

Only apply ProceduralMasquerade hack to older versions of rental #94063

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift click to select a range
10dad22
Only apply `ProceduralMasquerade` hack to older versions of `rental`
Aaron1011 Feb 16, 2022
ecc5d26
Bump cargotest servo to 785a344e32db58d4e631fd3cae17fd1f29a721ab
Aaron1011 Oct 22, 2022
541128d
Override linker in cargotest on windows
Aaron1011 Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Override linker in cargotest on windows
  • Loading branch information
@Aaron1011
Aaron1011 committed Oct 24, 2022
commit 541128dcb374c7eaa36872eb3a9085c401db7938
4 changes: 4 additions & 0 deletions src/tools/cargotest/main.rs
View file
Open in desktop
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