Add universal builds back to CI + link to OpenSSL dylib, not .a

This commit is contained in:
Twarit Waikar
2021-10-12 23:31:51 +05:30
parent 76dfd5a143
commit 4119ad2c74
7 changed files with 39 additions and 11 deletions

View File

@@ -131,6 +131,13 @@ if env_git["platform"] in ["linux", "osx"]:
)
if env_git["platform"] == "osx":
env_git.Prepend(CPPPATH=["/usr/local/opt/openssl@1.1/include/"])
# We link to OpenSSL dynamically only on macOS to allow universal builds
env_git.Prepend(
CPPDEFINES=[
"CRYPT_OPENSSL_DYNAMIC",
("GIT_OPENSSL_DYNAMIC", "1"),
]
)
env_git.Prepend(CPPPATH=[env_git["macos_ssl_path"] + "include/"])
env_git.StaticLibrary(target="../bin/" + "git2", source=libgit2_sources)