summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Levedahl <mlevedahl@gmail.com>2013-07-19 19:08:28 -0400
committerJunio C Hamano <gitster@pobox.com>2013-07-21 22:03:09 -0700
commit92f63d2b055fea3070108fe5015b8158e1c923db (patch)
treedeb6d04137536f30d4e1a06b4c3840ce9cb1bd3d
parente3d44930318ed3746fe6da51913602d4fad8daaf (diff)
downloadgit-92f63d2b055fea3070108fe5015b8158e1c923db.tar.gz
Cygwin 1.7 needs compat/regex
Cygwin v1.7 uses the regex library from newlib which does not pass git's tests, so don't use it. This fixes failures in t4018 and t4034. Continue to use the platform supplied regex library for earlier versions. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--config.mak.uname2
1 files changed, 2 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 7ac541e9eb..4606970073 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -159,6 +159,8 @@ ifeq ($(uname_O),Cygwin)
NO_SYMLINK_HEAD = YesPlease
NO_IPV6 = YesPlease
OLD_ICONV = UnfortunatelyYes
+ else
+ NO_REGEX = UnfortunatelyYes
endif
NO_THREAD_SAFE_PREAD = YesPlease
NEEDS_LIBICONV = YesPlease