Skip to content

Fix build script cargo instructions #4235

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

Merged
ChrisDenton merged 2 commits into from
Mar 5, 2025
Merged

Fix build script cargo instructions #4235

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d595d66
Update delay loaded DLLs
ChrisDenton Mar 5, 2025
58a02e7
Fix build script `cargo` instructions
ChrisDenton Mar 5, 2025
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
16 changes: 8 additions & 8 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ fn from_build() -> Result<String, String> {
}

fn main() {
println!("cargo:rerun-if-env-changed=RUSTUP_OVERRIDE_BUILD_TRIPLE");
println!("cargo:rerun-if-env-changed=TARGET");
println!("cargo::rerun-if-env-changed=RUSTUP_OVERRIDE_BUILD_TRIPLE");
println!("cargo::rerun-if-env-changed=TARGET");
match from_build() {
Ok(triple) => eprintln!("Computed build based on target triple: {triple:#?}"),
Err(s) => {
Expand All @@ -26,7 +26,7 @@ fn main() {
}
}
let target = env::var("TARGET").unwrap();
println!("cargo:rustc-env=TARGET={target}");
println!("cargo::rustc-env=TARGET={target}");

// Set linker options specific to Windows MSVC.
let target_os = env::var("CARGO_CFG_TARGET_OS");
Expand All @@ -40,7 +40,7 @@ fn main() {
// This applies to DLLs loaded at load time. However, this setting is ignored
// before Windows 10 RS1 (aka 1601).
// https://learn.microsoft.com/en-us/cpp/build/reference/dependentloadflag?view=msvc-170
println!("cargo:cargo:rustc-link-arg-bin=rustup-init=/DEPENDENTLOADFLAG:0x800");
println!("cargo::rustc-link-arg-bin=rustup-init=/DEPENDENTLOADFLAG:0x800");

// # Delay load
//
Expand All @@ -53,18 +53,18 @@ fn main() {
// This will work on all supported Windows versions but it relies on
// us using `SetDefaultDllDirectories` before any libraries are loaded.
// See also: src/bin/rustup-init.rs
let delay_load_dlls = ["bcrypt", "secur32"];
let delay_load_dlls = ["bcrypt", "api-ms-win-core-synch-l1-2-0"];
for dll in delay_load_dlls {
println!("cargo:rustc-link-arg-bin=rustup-init=/delayload:{dll}.dll");
println!("cargo::rustc-link-arg-bin=rustup-init=/delayload:{dll}.dll");
}
// When using delayload, it's necessary to also link delayimp.lib
// https://learn.microsoft.com/en-us/cpp/build/reference/dependentloadflag?view=msvc-170
println!("cargo:rustc-link-arg-bin=rustup-init=delayimp.lib");
println!("cargo::rustc-link-arg-bin=rustup-init=delayimp.lib");

// # Turn linker warnings into errors
//
// Rust hides linker warnings meaning mistakes may go unnoticed.
// Turning them into errors forces them to be displayed (and the build to fail).
// If we do want to ignore specific warnings then `/IGNORE:` should be used.
println!("cargo:rustc-link-arg-bin=rustup-init=/WX");
println!("cargo::rustc-link-arg-bin=rustup-init=/WX");
}
Loading
⚡