diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:56 -0800 |
| commit | 729fb9ad34cda2609396a61697508c61ec7d9f04 (patch) | |
| tree | ffaef10d2f6dfd2a8fd7ba5ec3b97bb3f3da26d1 /Makefile | |
| parent | 25e298d2c9f0b4ecd4fc668192a7112e89783d84 (diff) | |
| parent | a296bc01329b9e2aa91255c88626e8c8f831e428 (diff) | |
| download | git-729fb9ad34cda2609396a61697508c61ec7d9f04.tar.gz git-729fb9ad34cda2609396a61697508c61ec7d9f04.tar.xz | |
Merge branch 'ls/macos-update' into maint
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
@@ -1044,6 +1044,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 |