diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-05 16:53:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-05 16:56:13 -0800 |
| commit | 8188e73b17c570517ac3bac742810f1b2e5c420d (patch) | |
| tree | 2c3da069cc0279c0499d3289131024dc4a10cce9 | |
| parent | 35ce862279f68a4798889adcdd90a1698a2c102f (diff) | |
| download | git-8188e73b17c570517ac3bac742810f1b2e5c420d.tar.gz git-8188e73b17c570517ac3bac742810f1b2e5c420d.tar.xz | |
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>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |