Skip to content

Commit

Permalink
Build mbedTLS, libssh2, nghttp2 and curl disregarding `USE_SYSTEM_LIB…
Browse files Browse the repository at this point in the history
…GIT2=1` (#54367)

A long time ago, these libraries were only used indirectly by libgit2,
so
4526b65
made building them conditional on `USE_SYSTEM_LIBGIT2=0`. But nowadays
we always generate MbedTLS_jll, LibSSH2_jll, nghttp2_jll and
LibCURL_jll, even when not building libgit2, so we always need to have
these libraries available.
  • Loading branch information
nalimilan authored May 23, 2024
1 parent 1ed6a9f commit d122b55
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ ifeq ($(USE_SYSTEM_GMP), 0)
DEP_LIBS += gmp
endif

ifeq ($(USE_SYSTEM_LIBGIT2), 0)
ifeq ($(USE_SYSTEM_MBEDTLS), 0)
DEP_LIBS += mbedtls
endif
Expand All @@ -136,8 +135,9 @@ ifeq ($(USE_SYSTEM_CURL), 0)
DEP_LIBS += curl
endif

ifeq ($(USE_SYSTEM_LIBGIT2), 0)
DEP_LIBS += libgit2
endif # USE_SYSTEM_LIBGIT2
endif

ifeq ($(USE_SYSTEM_MPFR), 0)
DEP_LIBS += mpfr
Expand Down

0 comments on commit d122b55

Please sign in to comment.