diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:05 -0700 |
| commit | 55b6dffd135b51e643f5ebbcf346453a8ceebad0 (patch) | |
| tree | 1b2edc728b00d53864a287312c1234442253acdb | |
| parent | 08668f18021e12d7c86b8384011465832dbd0a41 (diff) | |
| parent | 9eeff2f6810d4f962aa78ddf43193fba26d9451a (diff) | |
| download | git-55b6dffd135b51e643f5ebbcf346453a8ceebad0.tar.gz | |
Merge branch 'jc/config-mak-document-darwin-vs-macosx'
* jc/config-mak-document-darwin-vs-macosx:
config.mak.uname: add hint on uname_R for MacOS X
config.mak.uname: set NO_APPLE_COMMON_CRYPTO on older systems
| -rw-r--r-- | config.mak.uname | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname index 15ee15e98c..a2f380fd8d 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -89,8 +89,13 @@ ifeq ($(uname_S),Darwin) NEEDS_CRYPTO_WITH_SSL = YesPlease NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease + # Note: $(uname_R) gives us the underlying Darwin version. + # - MacOS 10.0.* and MacOS 10.1.0 = Darwin 1.* + # - MacOS 10.x.* = Darwin (x+4).* for (1 <= x) + # i.e. "begins with [15678] and a dot" means "10.4.* or older". ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2) OLD_ICONV = UnfortunatelyYes + NO_APPLE_COMMON_CRYPTO = YesPlease endif ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2) NO_STRLCPY = YesPlease |