summaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-16 13:56:41 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-16 13:56:41 -0700
commit890d76504c79677c27f6661c0663e73519405ca3 (patch)
treea854e27e519a251f407a5ef68a46c27c18757789 /config.mak.uname
parentd880bfd947f5d5e2b5bcc510d6dee01101ce64a3 (diff)
parent2cfc70f0de7c8902791d3b23a92d6462b9e11d72 (diff)
downloadgit-890d76504c79677c27f6661c0663e73519405ca3.tar.gz
Merge branch 'jh/mingw-openssl-sha1' into maint
Windows port wants to use OpenSSL's implementation of SHA-1 routines, so let them. * jh/mingw-openssl-sha1: mingw: use OpenSSL's SHA-1 routines
Diffstat (limited to 'config.mak.uname')
-rw-r--r--config.mak.uname1
1 files changed, 0 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 447f36ac2e..a07936da8b 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -515,7 +515,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
NO_REGEX = YesPlease
NO_PYTHON = YesPlease
- BLK_SHA1 = YesPlease
ETAGS_TARGET = ETAGS
NO_INET_PTON = YesPlease
NO_INET_NTOP = YesPlease