Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
config.mak.uname: add hint on uname_R for MacOS X
author
Junio C Hamano
<gitster@pobox.com>
Fri, 15 Aug 2014 17:02:46 +0000
(10:02 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 15 Aug 2014 18:04:59 +0000
(11:04 -0700)
I always have to scratch my head every time I see this cryptic
pattern "[15678]\."; leave a short note to remind the maintainer
and the reviewers.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
config.mak.uname
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
9c7a0be
)
diff --git
a/config.mak.uname
b/config.mak.uname
index f8e12c96260730aa34a76f306d7fba578152ca15..fde196f63ab4b6f6a31dfe490c93b65f059ef756 100644
(file)
--- a/
config.mak.uname
+++ b/
config.mak.uname
@@
-86,6
+86,10
@@
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