diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-09 22:32:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-09 22:32:53 (GMT) |
| commit | a09a5e6c36d21d1697ab369ef917af7a682a25c5 (patch) | |
| tree | 83d3faf2005a5db79b9c12ac09475b7a5bc8c60f /Makefile | |
| parent | 26393822f88200304675283ac5b10e1e1f1b876b (diff) | |
| parent | edb6a17c36be107e87abd1ff641f317ea578e80e (diff) | |
| download | git-a09a5e6c36d21d1697ab369ef917af7a682a25c5.zip git-a09a5e6c36d21d1697ab369ef917af7a682a25c5.tar.gz git-a09a5e6c36d21d1697ab369ef917af7a682a25c5.tar.bz2 | |
Merge branch 'ab/dc-sha1-loose-ends'
Tying loose ends for the recent integration work of
collision-detecting SHA-1 implementation.
* ab/dc-sha1-loose-ends:
Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -23,7 +23,6 @@ all:: # it at all). # # Define NO_OPENSSL environment variable if you do not have OpenSSL. -# This also implies BLK_SHA1. # # Define USE_LIBPCRE if you have and want to use libpcre. Various # commands such as log and grep offer runtime options to use @@ -1275,7 +1274,6 @@ ifndef NO_OPENSSL endif else BASIC_CFLAGS += -DNO_OPENSSL - BLK_SHA1 = 1 OPENSSL_LIBSSL = endif ifdef NO_OPENSSL |