Skip to content

Commit

Permalink
Remove openssl linking for tests
Browse files Browse the repository at this point in the history
No longer appears to be necessary
  • Loading branch information
benjaminwinger committed Jul 14, 2023
1 parent 59763cf commit 6d13b20
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,12 @@ endif
rusttest:
ifeq ($(OS),Windows_NT)
cd $(ROOT_DIR)/tools/rust_api && \
set KUZU_TESTING=1 && \
set CFLAGS=/MDd && \
set CXXFLAGS=/MDd /std:c++20 && \
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:
Expand Down
13 changes: 0 additions & 13 deletions tools/rust_api/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,6 @@ 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 cfg!(windows) {
println!("cargo:rustc-link-lib=static=parquet_static");
Expand Down

0 comments on commit 6d13b20

Please sign in to comment.