From: Junio C Hamano <junkio@cox.net>
Date: Tue, 6 Feb 2007 00:53:12 +0000 (-0800)
Subject: Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS
X-Git-Tag: v1.5.0-rc4~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8188e73b17c570517ac3bac742810f1b2e5c420d;p=git.git

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>
---

diff --git a/Makefile b/Makefile
index 91bd66572..fc98b27c5 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