On Fri, Nov 02, 2007 at 02:03:52AM -0700, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Blake Ramsdell <blaker@xxxxxxxxx> writes: > > > Signed-off-by: Blake Ramsdell <blaker@xxxxxxxxx> > > --- > > Makefile | 4 +++- > > 1 files changed, 3 insertions(+), 1 deletions(-) > > > > diff --git a/Makefile b/Makefile > > index 71479a2..5d83756 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -401,7 +401,9 @@ endif > > ifeq ($(uname_S),Darwin) > > NEEDS_SSL_WITH_CRYPTO = YesPlease > > NEEDS_LIBICONV = YesPlease > > - OLD_ICONV = UnfortunatelyYes > > + ifneq ($(uname_R),9.0.0) > > + OLD_ICONV = UnfortunatelyYes > > + endif > > NO_STRLCPY = YesPlease > > NO_MEMMEM = YesPlease > > endif > > I do not have an access to a Darwin box, but do you mean 10.5 > gives 9.0.0 as uname_R? Be it that or not, it looks wrong to me to check the Darwin version to know what to use. Do you rely on the Linux kernel version to know whether iconv is present ? Mike - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
