Skip to content

Commit 8dbac0c

Browse files
authored
fix: Explicitly link against advapi32 on Windows, reactivate Windows Nightly and Beta builds in CI (#286)
* ci: reactivate Windows / Beta Rust in CI This reverts commit 2594b6e. Signed-off-by: Spencer Wilson <[email protected]> * ci: Re-enable nightly builds on Windows This reverts commit d9590eb. Signed-off-by: Spencer Wilson <[email protected]> * fix: Explicitly link against advapi32 on Windows Signed-off-by: Spencer Wilson <[email protected]> --------- Signed-off-by: Spencer Wilson <[email protected]>
1 parent 2594b6e commit 8dbac0c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/ci.yml

-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ jobs:
1818
update-liboqs:
1919
- true
2020
- false
21-
exclude:
22-
- os: windows-latest
23-
rust: nightly
24-
- os: windows-latest
25-
rust: beta
2621
env:
2722
# 20 MiB stack
2823
RUST_MIN_STACK: 20971520

oqs-sys/build.rs

+6
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ fn build_from_source() -> PathBuf {
147147
// Statically linking makes it easier to use the sys crate
148148
println!("cargo:rustc-link-lib=static=oqs");
149149
}
150+
151+
if cfg!(windows) {
152+
// Explicitly link against advapi32. See https://github.com/rust-lang/rust/issues/140555
153+
println!("cargo:rustc-link-lib=advapi32");
154+
}
155+
150156
println!("cargo:rustc-link-search=native={}", libdir.display());
151157
println!("cargo:rustc-link-search=native={}", libdir64.display());
152158

0 commit comments

Comments
 (0)