From 8346adaca0e135c699150b870d216eed7132a057 Mon Sep 17 00:00:00 2001 From: TheVeryDarkness <3266343194@qq.com> Date: Wed, 18 Oct 2023 13:54:21 +0800 Subject: [PATCH 1/2] Remove explicit linkage include in tests. I guess brotlicommon-static has already been a static library so we don't need that. Test this later on Windows. --- tests/harfbuzz/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/harfbuzz/build.rs b/tests/harfbuzz/build.rs index 3f4a2cc..b9cb5fc 100644 --- a/tests/harfbuzz/build.rs +++ b/tests/harfbuzz/build.rs @@ -8,7 +8,6 @@ fn main() { // libraries in. This only matters on Linux at present. (vcpkg itself // does fine, but vcpkg-rs needs to work out how to get the link order // from the it.) - println!("cargo:rustc-link-lib=brotlicommon-static"); let mut build = cc::Build::new(); build.file("src/test.c"); From cc840a56a854f0ecd700c042f6f7a6b71df21f9b Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Thu, 19 Oct 2023 23:11:15 -0400 Subject: [PATCH 2/2] Removed superseded comment --- tests/harfbuzz/build.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/harfbuzz/build.rs b/tests/harfbuzz/build.rs index b9cb5fc..b79306e 100644 --- a/tests/harfbuzz/build.rs +++ b/tests/harfbuzz/build.rs @@ -4,11 +4,6 @@ extern crate vcpkg; fn main() { let libs = vcpkg::Config::new().find_package("harfbuzz").unwrap(); - // vcpkg-rs is not capable of working out the correct order to link - // libraries in. This only matters on Linux at present. (vcpkg itself - // does fine, but vcpkg-rs needs to work out how to get the link order - // from the it.) - let mut build = cc::Build::new(); build.file("src/test.c"); for inc in libs.include_paths {