diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-09 11:59:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 11:59:38 -0700 |
| commit | b8a30194dbea86228aa55fb270f3d704cf7924f4 (patch) | |
| tree | 2a844dbab6da69248532e464e1a16547fe047022 /Makefile | |
| parent | 693b407077bf3739b3609400845e3f6854830ee4 (diff) | |
| parent | f80d1f95f0adf9909f42eb9e74546963daa4b0c1 (diff) | |
| download | git-b8a30194dbea86228aa55fb270f3d704cf7924f4.tar.gz git-b8a30194dbea86228aa55fb270f3d704cf7924f4.tar.xz | |
Merge branch 'jk/commit-dates-parsing-fix' into maint
* jk/commit-dates-parsing-fix:
t4212: loosen far-in-future test for AIX
date: recognize bogus FreeBSD gmtime output
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -342,6 +342,9 @@ all:: # Define DEFAULT_HELP_FORMAT to "man", "info" or "html" # (defaults to "man") if you want to have a different default when # "git help" is called without a parameter specifying the format. +# +# Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not +# return NULL when it receives a bogus time_t. GIT-VERSION-FILE: FORCE @$(SHELL_PATH) ./GIT-VERSION-GEN @@ -1494,6 +1497,11 @@ ifneq (,$(XDL_FAST_HASH)) BASIC_CFLAGS += -DXDL_FAST_HASH endif +ifdef GMTIME_UNRELIABLE_ERRORS + COMPAT_OBJS += compat/gmtime.o + BASIC_CFLAGS += -DGMTIME_UNRELIABLE_ERRORS +endif + ifeq ($(TCLTK_PATH),) NO_TCLTK = NoThanks endif |