Skip to content

Commit f679da1

Browse files
committed
More fixes of building rust libraries with ENABLE_OPENSSL_DYNAMIC
1 parent cfbdd27 commit f679da1

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

contrib/delta-kernel-rs-cmake/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,19 @@ file(COPY ${ClickHouse_SOURCE_DIR}/contrib/openssl/include/ DESTINATION ${DELTA_
5858
set(DELTA_KERNEL_TARGET_PATH ${DELTA_KERNEL_RS_BINARY_DIR}/include)
5959

6060
set(DELTA_KERNEL_FFI_OPENSSL "OPENSSL_STATIC=1")
61+
set(DELTA_KERNEL_FFI_OPENSSL_LIB_DIR "${CMAKE_BINARY_DIR}/contrib/openssl-cmake/")
62+
6163
if (ENABLE_OPENSSL_DYNAMIC)
6264
set(DELTA_KERNEL_FFI_OPENSSL "OPENSSL_DYNAMIC=1")
65+
set(DELTA_KERNEL_FFI_OPENSSL_LIB_DIR "${CMAKE_BINARY_DIR}/programs")
6366
endif()
6467

6568
corrosion_set_env_vars(delta_kernel_ffi
6669
"CARGO_HOME=${CMAKE_BINARY_DIR}/contrib/corrosion-cmake/"
6770
"CARGO_TARGET_DIR=${DELTA_KERNEL_TARGET_PATH}"
6871
"OPENSSL_LIBS=ssl:crypto"
6972
"${DELTA_KERNEL_FFI_OPENSSL}"
70-
"OPENSSL_LIB_DIR=${CMAKE_BINARY_DIR}/contrib/openssl-cmake/"
73+
"OPENSSL_LIB_DIR=${DELTA_KERNEL_FFI_OPENSSL_LIB_DIR}"
7174
"OPENSSL_INCLUDE_DIR=${DELTA_KERNEL_RS_BINARY_DIR}/${PLATFORM_DIRECTORY}")
7275

7376
target_include_directories(delta_kernel_ffi INTERFACE "${DELTA_KERNEL_TARGET_PATH}/")

0 commit comments

Comments
 (0)