Skip to content

Commit

Permalink
Merge branch 'jc/config-mak-document-darwin-vs-macosx'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Junio C Hamano committed Sep 9, 2014
2 parents 08668f1 + 9eeff2f commit 55b6dff
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions config.mak.uname
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 55b6dff

Please sign in to comment.