aboutsummaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-19 12:38:43 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-19 12:38:43 -0700
commitae7e4d4fedc2237217a9f802eba4ded9ea66bb91 (patch)
tree6a10111b07939e0013082185ad4d5d471822bf03 /config.mak.uname
parent32e0da583f70fe1406268217befd61e3f515505f (diff)
parent94da9193a6eb8f1085d611c04ff8bbb4f5ae1e0a (diff)
downloadgit-ae7e4d4fedc2237217a9f802eba4ded9ea66bb91.tar.gz
git-ae7e4d4fedc2237217a9f802eba4ded9ea66bb91.tar.xz
Merge branch 'ab/pcre-v2'
Update "perl-compatible regular expression" support to enable JIT and also allow linking with the newer PCRE v2 library. * ab/pcre-v2: grep: add support for PCRE v2 grep: un-break building with PCRE >= 8.32 without --enable-jit grep: un-break building with PCRE < 8.20 grep: un-break building with PCRE < 8.32 grep: add support for the PCRE v1 JIT API log: add -P as a synonym for --perl-regexp grep: skip pthreads overhead when using one thread grep: don't redundantly compile throwaway patterns under threading
Diffstat (limited to 'config.mak.uname')
-rw-r--r--config.mak.uname1
1 files changed, 1 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname
index d2cabe7fb..adfb90b60 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -555,6 +555,7 @@ else
NO_GETTEXT =
USE_GETTEXT_SCHEME = fallthrough
USE_LIBPCRE= YesPlease
+ NO_LIBPCRE1_JIT = UnfortunatelyYes
NO_CURL =
USE_NED_ALLOCATOR = YesPlease
else