summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-14 15:50:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-14 15:50:20 (GMT)
commit40d675f417f7b0be7b9367752701bf6bc03db091 (patch)
tree1b69be96d7c41f361d684f9f8eefa6fdae7f95ea /Makefile
parentb69fb7866b24b205a876a6a0b256c786a58419c7 (diff)
parent5b02b9baf728f6155e2996e5945e07f2e1a57b05 (diff)
downloadgit-40d675f417f7b0be7b9367752701bf6bc03db091.zip
git-40d675f417f7b0be7b9367752701bf6bc03db091.tar.gz
git-40d675f417f7b0be7b9367752701bf6bc03db091.tar.bz2
Merge branch 'jc/maint-no-openssl-build-fix' into maint
* jc/maint-no-openssl-build-fix: Do not link with -lcrypto under NO_OPENSSL
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f2de401..ecb4e64 100644
--- a/Makefile
+++ b/Makefile
@@ -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