diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-08 00:19:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-08 00:19:59 (GMT) |
| commit | 410a0e520dcc91d13f77fd812f068161859883fc (patch) | |
| tree | 0e4e7529bb2c344bfccaef6396f5c71d2d04519f /Makefile | |
| parent | 3dcec76d9df911ed8321007b1d197c1a206dc164 (diff) | |
| parent | 1819ad327b7a1f19540a819813b70a0e8a7f798f (diff) | |
| download | git-410a0e520dcc91d13f77fd812f068161859883fc.zip git-410a0e520dcc91d13f77fd812f068161859883fc.tar.gz git-410a0e520dcc91d13f77fd812f068161859883fc.tar.bz2 | |
Merge branch 'ds/use-platform-regex-on-macos'
With a bit of header twiddling, use the native regexp library on
macOS instead of the compat/ one.
* ds/use-platform-regex-on-macos:
grep: fix multibyte regex handling under macOS
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1442,7 +1442,6 @@ ifeq ($(uname_S),Darwin) APPLE_COMMON_CRYPTO = YesPlease COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO endif - NO_REGEX = YesPlease PTHREAD_LIBS = endif @@ -2980,6 +2979,7 @@ GIT-BUILD-OPTIONS: FORCE @echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@+ @echo NO_PTHREADS=\''$(subst ','\'',$(subst ','\'',$(NO_PTHREADS)))'\' >>$@+ @echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@+ + @echo NO_REGEX=\''$(subst ','\'',$(subst ','\'',$(NO_REGEX)))'\' >>$@+ @echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@+ @echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+ @echo DC_SHA1=\''$(subst ','\'',$(subst ','\'',$(DC_SHA1)))'\' >>$@+ |