mig5/bouquin-sqlcipher4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build on universal2

Browse source
This commit is contained in:
laggykiller 2024-02-24 11:08:32 +08:00
parent fe2ce19729
commit 2d37b15c9e
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
setup.py
View file

@ -146,9 +146,11 @@ if arch == "universal2":
add_deps(conan_info_x64, library_dirs, include_dirs) add_deps(conan_info_x64, library_dirs, include_dirs)
conan_info_arm = install_openssl("armv8") conan_info_arm = install_openssl("armv8")
add_deps(conan_info_arm, library_dirs, include_dirs) add_deps(conan_info_arm, library_dirs, include_dirs)
zlib_required = check_zlib_required(conan_info_x64)
else: else:
conan_info = install_openssl(arch) conan_info = install_openssl(arch)
add_deps(conan_info, library_dirs, include_dirs) add_deps(conan_info, library_dirs, include_dirs)
zlib_required = check_zlib_required(conan_info)
# Configure the linker # Configure the linker
extra_link_args = [] extra_link_args = []
@ -159,7 +161,7 @@ if sys.platform == "win32":
extra_link_args.append("ADVAPI32.LIB") extra_link_args.append("ADVAPI32.LIB")
extra_link_args.append("CRYPT32.LIB") extra_link_args.append("CRYPT32.LIB")
extra_link_args.append("USER32.LIB") extra_link_args.append("USER32.LIB")
if check_zlib_required(conan_info): if zlib_required:
extra_link_args.append("zlib.lib") extra_link_args.append("zlib.lib")
extra_link_args.append("libcrypto.lib") extra_link_args.append("libcrypto.lib")
else: else: