Skip to content

Commit

Permalink
Merge branch 'jc/maint-no-openssl-build-fix' into maint
Browse files Browse the repository at this point in the history
* jc/maint-no-openssl-build-fix:
  Do not link with -lcrypto under NO_OPENSSL
  • Loading branch information
Junio C Hamano committed Dec 14, 2010
2 parents b69fb78 + 5b02b9b commit 40d675f
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1262,11 +1262,15 @@ else
BLK_SHA1 = 1
OPENSSL_LIBSSL =
endif
ifdef NO_OPENSSL
LIB_4_CRYPTO =
else
ifdef NEEDS_SSL_WITH_CRYPTO
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
else
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
endif
endif
ifdef NEEDS_LIBICONV
ifdef ICONVDIR
BASIC_CFLAGS += -I$(ICONVDIR)/include
Expand Down

0 comments on commit 40d675f

Please sign in to comment.