Skip to content

Commit

Permalink
Makefile: minor improvements for Mac OS X (Darwin)
Browse files Browse the repository at this point in the history
1) Instead of requesting OLD_ICONV on all Mac OS X versions except for 10.5
(which will break when 10.6 is released), exlicitly request it for versions
older than 10.5.

2) NO_STRLCPY is not needed since Mac OS X 10.2. Noticed by Benjamin Kramer.

Note that uname -r returns the underlying Darwin version, which can be mapped
to Mac OS X version at http://www.opensource.apple.com/darwinsource/

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
jaysoffian authored and gitster committed Feb 5, 2009
1 parent 98bb1ff commit 7233d22
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Expand Up @@ -649,10 +649,12 @@ endif
ifeq ($(uname_S),Darwin)
NEEDS_SSL_WITH_CRYPTO = YesPlease
NEEDS_LIBICONV = YesPlease
ifneq ($(shell expr "$(uname_R)" : '9\.'),2)
ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2)
OLD_ICONV = UnfortunatelyYes
endif
NO_STRLCPY = YesPlease
ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2)
NO_STRLCPY = YesPlease
endif
NO_MEMMEM = YesPlease
THREADED_DELTA_SEARCH = YesPlease
endif
Expand Down

0 comments on commit 7233d22

Please sign in to comment.