Merge branch 'ab/compat-regex'

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 32e3eb385d82126396c452f43b1fa70d5a7b4321..40fbcaee9378db51ed22d0511b52a62b774cac45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1900,6 +1900,10 @@ ifdef NO_EXPAT
 http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
 endif
 
+ifdef NO_REGEX
+compat/regex/regex.o: EXTRA_CPPFLAGS = -DGAWK -DNO_MBSUPPORT
+endif
+
 git-%$X: %.o $(GITLIBS)
        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)