@matheusbsbs / matheus-bagliano / commits / 8188e73b17
Fork 0

Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS

The earlier commit d7b6c3c0 (Aug 15, 2006) introduced this mismerge when most of the CFLAGS were renamed to BASIC_CFLAGS. Not that it matters right now, since we do not compile XS Perl extensions which wanted non GNU subset of ALL_CFLAGS for compilation, but we should make things consistent. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Feb 5, 2007 at 16:53 UTC 8188e73b17c570517ac3bac742810f1b2e5c420d
1 file changed +1 -1
Makefile
+1 -1
@@ -504,7 +504,7 @@ ifdef NO_D_INO_IN_DIRENT
504 BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
505 endif
506 ifdef NO_C99_FORMAT
507 - ALL_CFLAGS += -DNO_C99_FORMAT
507 + BASIC_CFLAGS += -DNO_C99_FORMAT
508 endif
509 ifdef NO_SYMLINK_HEAD
510 BASIC_CFLAGS += -DNO_SYMLINK_HEAD