Merge pull request #48793 from stahta01/libgit_find_libssh2_fix

[WINDOWS][BUILD] Fix for Cygwin using USE_BINARYBUILDER_LIBGIT2=0
JuliaLang · May 22, 2023 · 1c21cbb · 1c21cbb
2 parents 672f609 + e4a563a
commit 1c21cbb
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/deps/libgit2.mk b/deps/libgit2.mk
@@ -16,6 +16,11 @@ endif
 LIBGIT2_OPTS := $(CMAKE_COMMON) -DCMAKE_BUILD_TYPE=Release -DUSE_THREADS=ON -DUSE_BUNDLED_ZLIB=ON -DUSE_SSH=ON -DBUILD_CLI=OFF
 ifeq ($(OS),WINNT)
 LIBGIT2_OPTS += -DWIN32=ON -DMINGW=ON
+ifeq ($(USE_SYSTEM_LIBSSH2), 0)
+LIBGIT2_OPTS += -DLIBSSH2_LIBRARIES=libssh2.dll
+LIBGIT2_OPTS += -DLIBSSH2_LIBRARY_DIRS=$(build_prefix)/lib
+LIBGIT2_OPTS += -DLIBSSH2_INCLUDE_DIRS=$(build_prefix)/include
+endif # USE_SYSTEM_LIBSSH2=0
 ifneq ($(ARCH),x86_64)
 ifneq ($(USECLANG),1)
 LIBGIT2_OPTS += -DCMAKE_C_FLAGS="-mincoming-stack-boundary=2"