mirror-github-bspeice
/
aeron-rs
mirror of https://github.com/bspeice/aeron-rs
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge #26 

26: Minor build cleanup r=bspeice a=bspeice

bors r+

Co-authored-by: Bradlee Speice <bradlee@speice.io>
staging
bors[bot] 2020-03-08 00:59:45 +00:00 committed by GitHub
parent c0de7f580e a11a1acda3
commit c59164951b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
aeron-driver-sys/build.rs
View File

@ -47,17 +47,14 @@ pub fn main() {
link_type.target_name()
);
match link_type {
LinkType::Static => {
// On Windows, there are some extra libraries needed for static link
// that aren't included by Aeron.
if cfg!(target_os = "windows") {
println!("cargo:rustc-link-lib=shell32");
println!("cargo:rustc-link-lib=iphlpapi");
}
if let LinkType::Static = link_type {
// On Windows, there are some extra libraries needed for static link
// that aren't included by Aeron.
if cfg!(target_os = "windows") {
println!("cargo:rustc-link-lib=shell32");
println!("cargo:rustc-link-lib=iphlpapi");
}
_ => (),
};
}
let cmake_output = Config::new(&aeron_path)
.build_target(link_type.target_name())

2
aeron-rs/Cargo.toml
View File

@ -17,5 +17,5 @@ memmap = "0.7"
[dev-dependencies]
clap = "2.33"
ctrlc = "3.1.3"
ctrlc = "=3.1.3"
tempfile = "3.1"