From 2d37b15c9e94e71b5ca5e84f2c3fe847d906a14d Mon Sep 17 00:00:00 2001 From: laggykiller <61652821+laggykiller@users.noreply.github.com> Date: Sat, 24 Feb 2024 11:08:32 +0800 Subject: [PATCH] Fix build on universal2 --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2ee8295..ac4771c 100644 --- a/setup.py +++ b/setup.py @@ -146,9 +146,11 @@ if arch == "universal2": add_deps(conan_info_x64, library_dirs, include_dirs) conan_info_arm = install_openssl("armv8") add_deps(conan_info_arm, library_dirs, include_dirs) + zlib_required = check_zlib_required(conan_info_x64) else: conan_info = install_openssl(arch) add_deps(conan_info, library_dirs, include_dirs) + zlib_required = check_zlib_required(conan_info) # Configure the linker extra_link_args = [] @@ -159,7 +161,7 @@ if sys.platform == "win32": extra_link_args.append("ADVAPI32.LIB") extra_link_args.append("CRYPT32.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("libcrypto.lib") else: