From 6312d9520dd8ee094863a3051d0a8a52aef42c43 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 21 Sep 2019 15:50:07 -0400 Subject: [PATCH 1/3] Enable static building in Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca7b19e..4384fb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ script: - cd aeron_driver-sys - cargo test - cargo test --release - #- cargo test --features "static" + - cargo test --features "static" - cd .. - cargo test From 1d0e68a2da6b5922102c27d7998fd23e740da943 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 21 Sep 2019 18:06:48 -0400 Subject: [PATCH 2/3] Add extra Windows SDK static libs --- aeron_driver-sys/build.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/aeron_driver-sys/build.rs b/aeron_driver-sys/build.rs index 11fa3e6..778d414 100644 --- a/aeron_driver-sys/build.rs +++ b/aeron_driver-sys/build.rs @@ -46,6 +46,19 @@ pub fn main() { link_type.link_lib(), 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"); + } + }, + _ => () + }; + let cmake_output = Config::new(&aeron_path) .build_target(link_type.target_name()) .build(); From 11691a4bb2d7da1df5250dc3906374da527909ea Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 21 Sep 2019 18:23:51 -0400 Subject: [PATCH 3/3] Fix cargo fmt --- aeron_driver-sys/build.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aeron_driver-sys/build.rs b/aeron_driver-sys/build.rs index 778d414..a5c1231 100644 --- a/aeron_driver-sys/build.rs +++ b/aeron_driver-sys/build.rs @@ -55,8 +55,8 @@ pub fn main() { println!("cargo:rustc-link-lib=shell32"); println!("cargo:rustc-link-lib=iphlpapi"); } - }, - _ => () + } + _ => (), }; let cmake_output = Config::new(&aeron_path)