diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
| commit | 332fd5655a1e162b2fe47009dfc77ca2a94908e7 (patch) | |
| tree | b41171cbf1491fcfa389cf31a25b99f41b3620eb /Makefile | |
| parent | 5de732f647609de15f51e98b9c9de07115b58b5c (diff) | |
| parent | a296bc01329b9e2aa91255c88626e8c8f831e428 (diff) | |
| download | git-332fd5655a1e162b2fe47009dfc77ca2a94908e7.tar.gz git-332fd5655a1e162b2fe47009dfc77ca2a94908e7.tar.xz | |
Merge branch 'ls/macos-update'
Portability update and workaround for builds on recent Mac OS X.
* ls/macos-update:
travis-ci: disable GIT_TEST_HTTPD for macOS
Makefile: set NO_OPENSSL on macOS by default
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1047,6 +1047,7 @@ ifeq ($(uname_S),Darwin) endif endif ifndef NO_APPLE_COMMON_CRYPTO + NO_OPENSSL = YesPlease APPLE_COMMON_CRYPTO = YesPlease COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO endif |