From 69b259b40936fc1c03d545d0aa54bb48228d6578 Mon Sep 17 00:00:00 2001 From: HarryLeeIBM Date: Tue, 23 Apr 2024 16:34:00 -0700 Subject: [PATCH] Fix build for openssl dynamic linking --- contrib/openssl-cmake/CMakeLists.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/contrib/openssl-cmake/CMakeLists.txt b/contrib/openssl-cmake/CMakeLists.txt index ddbe9f06b1d..14528fbc16f 100644 --- a/contrib/openssl-cmake/CMakeLists.txt +++ b/contrib/openssl-cmake/CMakeLists.txt @@ -93,6 +93,7 @@ enable_language(ASM) if(COMPILER_CLANG) add_definitions(-Wno-unused-command-line-argument) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") endif() if(ARCH_AMD64) @@ -960,11 +961,6 @@ set(CRYPTO_SRC ${OPENSSL_SOURCE_DIR}/crypto/x509/x_req.c ${OPENSSL_SOURCE_DIR}/crypto/x509/x_x509.c ${OPENSSL_SOURCE_DIR}/crypto/x509/x_x509a.c - ${OPENSSL_SOURCE_DIR}/engines/e_capi.c - ${OPENSSL_SOURCE_DIR}/engines/e_dasync.c - ${OPENSSL_SOURCE_DIR}/engines/e_loader_attic.c - ${OPENSSL_SOURCE_DIR}/engines/e_ossltest.c - ${OPENSSL_SOURCE_DIR}/engines/e_padlock.c ${OPENSSL_SOURCE_DIR}/providers/baseprov.c ${OPENSSL_SOURCE_DIR}/providers/common/bio_prov.c ${OPENSSL_SOURCE_DIR}/providers/common/capabilities.c @@ -985,8 +981,6 @@ set(CRYPTO_SRC ${OPENSSL_SOURCE_DIR}/providers/common/securitycheck.c ${OPENSSL_SOURCE_DIR}/providers/common/securitycheck_default.c ${OPENSSL_SOURCE_DIR}/providers/defltprov.c - ${OPENSSL_SOURCE_DIR}/providers/fips/fips_entry.c - ${OPENSSL_SOURCE_DIR}/providers/fips/fipsprov.c ${OPENSSL_SOURCE_DIR}/providers/implementations/asymciphers/rsa_enc.c ${OPENSSL_SOURCE_DIR}/providers/implementations/asymciphers/sm2_enc.c ${OPENSSL_SOURCE_DIR}/providers/implementations/ciphers/cipher_aes.c @@ -1145,9 +1139,10 @@ set(CRYPTO_SRC ${OPENSSL_SOURCE_DIR}/providers/implementations/signature/sm2_sig.c ${OPENSSL_SOURCE_DIR}/providers/implementations/storemgmt/file_store.c ${OPENSSL_SOURCE_DIR}/providers/implementations/storemgmt/file_store_any2obj.c - ${OPENSSL_SOURCE_DIR}/providers/legacyprov.c ${OPENSSL_SOURCE_DIR}/providers/nullprov.c ${OPENSSL_SOURCE_DIR}/providers/prov_running.c + ${OPENSSL_SOURCE_DIR}/ssl/record/methods/tls_pad.c + ${OPENSSL_SOURCE_DIR}/ssl/record/methods/ssl3_cbc.c ) if(ARCH_AMD64)