From 8188e73b17c570517ac3bac742810f1b2e5c420d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 5 Feb 2007 16:53:12 -0800 Subject: [PATCH] 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 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 91bd665725..fc98b27c59 100644 --- a/Makefile +++ b/Makefile @@ -504,7 +504,7 @@ ifdef NO_D_INO_IN_DIRENT BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT endif ifdef NO_C99_FORMAT - ALL_CFLAGS += -DNO_C99_FORMAT + BASIC_CFLAGS += -DNO_C99_FORMAT endif ifdef NO_SYMLINK_HEAD BASIC_CFLAGS += -DNO_SYMLINK_HEAD -- 2.11.4.GIT