mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-24 18:30:46 +02:00
Code

Merge branch 'jc/maint-no-openssl-build-fix' into maint

Browse Source 
* jc/maint-no-openssl-build-fix:
  Do not link with -lcrypto under NO_OPENSSL
This commit is contained in:
Junio C Hamano 2010-12-14 07:50:20 -08:00
commit 40d675f417
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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