Makefile: minor improvements for Mac OS X (Darwin)
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>
Jay Soffian committed
Feb 5, 2009 at 01:09 UTC
7233d221ada5d32acabda0bed2d03486b76204fb
1 file changed
+4
-2
Makefile
+4
-2
@@ -649,10 +649,12 @@ endif
649
ifeq ($(uname_S),Darwin)
650
NEEDS_SSL_WITH_CRYPTO = YesPlease
651
NEEDS_LIBICONV = YesPlease
652
- ifneq ($(shell expr "$(uname_R)" : '9\.'),2)
652
+ ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2)
653
OLD_ICONV = UnfortunatelyYes
654
endif
655
- NO_STRLCPY = YesPlease
655
+ ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2)
656
+ NO_STRLCPY = YesPlease
657
+ endif
658
NO_MEMMEM = YesPlease
659
THREADED_DELTA_SEARCH = YesPlease
660
endif