summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 18:59:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-08 18:59:06 (GMT)
commitbdb830c44567ebbdec497e6af21b87d4e43539cc (patch)
tree1a56e047fa97260f688394304d36b2ff3d1c6ace /Makefile
parent4e49d95ece7e023106349875df05fed0601920a5 (diff)
parentf80d1f95f0adf9909f42eb9e74546963daa4b0c1 (diff)
downloadgit-bdb830c44567ebbdec497e6af21b87d4e43539cc.zip
git-bdb830c44567ebbdec497e6af21b87d4e43539cc.tar.gz
git-bdb830c44567ebbdec497e6af21b87d4e43539cc.tar.bz2
Merge branch 'jk/commit-dates-parsing-fix'
Finishing touches for portability. * 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--Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c5316a3..f49f187 100644
--- a/Makefile
+++ b/Makefile
@@ -338,6 +338,9 @@ all::
# Define TEST_GIT_INDEX_VERSION to 2, 3 or 4 to run the test suite
# with a different indexfile format version. If it isn't set the index
# file format used is index-v[23].
+#
+# 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
@@ -1489,6 +1492,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