summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2013-05-11 01:22:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-11 10:41:26 -0700
commit29de20504e9790785fe1698300755323f74972aa (patch)
treef9b786b196302c62d057a521f4fe4e947098a54d /Makefile
parentSync with v1.8.2.3 (diff)
downloadtgif-29de20504e9790785fe1698300755323f74972aa.tar.xz
Makefile: fix default regex settings on Darwin
t0070-fundamental.sh fails on Mac OS X 10.8: $ uname -a Darwin lustrous 12.2.0 Darwin Kernel Version 12.2.0: Sat Aug 25 00:48:52 PDT 2012; root:xnu-2050.18.24~1/RELEASE_X86_64 x86_64 $ ./t0070-fundamental.sh -v fatal: regex bug confirmed: re-build git with NO_REGEX=1 Fix it by using Git's regex library. Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0f931a2030..f698c1a59e 100644
--- a/Makefile
+++ b/Makefile
@@ -1054,6 +1054,7 @@ ifeq ($(uname_S),Darwin)
BASIC_LDFLAGS += -L/opt/local/lib
endif
endif
+ NO_REGEX = YesPlease
PTHREAD_LIBS =
endif