From 19df59b6789c3f1b968772e4cfb570ff75a6a804 Mon Sep 17 00:00:00 2001 From: Benjamin Winger Date: Fri, 14 Jul 2023 09:08:15 -0400 Subject: [PATCH] Remove openssl linking for tests on non-windows platforms No longer appears to be necessary outside of windows --- Makefile | 2 +- tools/rust_api/build.rs | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index afaaaade77..298610d0cc 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ ifeq ($(OS),Windows_NT) cargo test -- --test-threads=1 else cd $(ROOT_DIR)/tools/rust_api && \ - CARGO_BUILD_JOBS=$(NUM_THREADS) KUZU_TESTING=1 cargo test -- --test-threads=1 + CARGO_BUILD_JOBS=$(NUM_THREADS) cargo test -- --test-threads=1 endif clean-python-api: diff --git a/tools/rust_api/build.rs b/tools/rust_api/build.rs index fab3483faa..0f8490cf89 100644 --- a/tools/rust_api/build.rs +++ b/tools/rust_api/build.rs @@ -66,18 +66,10 @@ fn link_libraries() { } println!("cargo:rustc-link-lib=static=arrow_bundled_dependencies"); - // arrow's bundled dependencies link against openssl when it's on the system, whether - // requested or not. - // Only seems to be necessary when building tests. - if env::var("KUZU_TESTING").is_ok() { - if cfg!(windows) { - find_openssl_windows(); - println!("cargo:rustc-link-lib=dylib=libssl"); - println!("cargo:rustc-link-lib=dylib=libcrypto"); - } else { - println!("cargo:rustc-link-lib=dylib=ssl"); - println!("cargo:rustc-link-lib=dylib=crypto"); - } + if env::var("KUZU_TESTING").is_ok() && cfg!(windows) { + find_openssl_windows(); + println!("cargo:rustc-link-lib=dylib=libssl"); + println!("cargo:rustc-link-lib=dylib=libcrypto"); } if cfg!(windows) {