summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-11 05:24:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-11 05:24:47 (GMT)
commit93424f1f7d790944168d46faf5222a388898d031 (patch)
tree08bc467ba4b98aa5dd4beee2f0391714e2c8b779 /Makefile
parenta73f91774cbfb6f31bca328ebf200498fe92d97a (diff)
parentff61681b46760f6a64353018760bccc14c90f8e9 (diff)
downloadgit-93424f1f7d790944168d46faf5222a388898d031.zip
git-93424f1f7d790944168d46faf5222a388898d031.tar.gz
git-93424f1f7d790944168d46faf5222a388898d031.tar.bz2
Merge branch 'cb/pcre1-cleanup'
PCRE fixes. * cb/pcre1-cleanup: grep: refactor and simplify PCRE1 support grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index c99361e..03b800d 100644
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,8 @@ all::
# library. Support for version 1 will likely be removed in some future
# release of Git, as upstream has all but abandoned it.
#
-# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if the PCRE v1
-# library is compiled without --enable-jit. We will auto-detect
-# whether the version of the PCRE v1 library in use has JIT support at
-# all, but we unfortunately can't auto-detect whether JIT support
-# hasn't been compiled in in an otherwise JIT-supporting version. If
-# you have link-time errors about a missing `pcre_jit_exec` define
-# this, or recompile PCRE v1 with --enable-jit.
+# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if you want to
+# disable JIT even if supported by your library.
#
# Define LIBPCREDIR=/foo/bar if your PCRE header and library files are
# in /foo/bar/include and /foo/bar/lib directories. Which version of