summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 35ce862)
raw | patch | inline | side by side (parent: 35ce862)
author | Junio C Hamano <junkio@cox.net> | |
Tue, 6 Feb 2007 00:53:12 +0000 (16:53 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 6 Feb 2007 00:56:13 +0000 (16:56 -0800) |
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>
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>
Makefile | patch | blob | history |
diff --git a/Makefile b/Makefile
index 91bd665725ddb8675df755450c441f34efc98ae4..fc98b27c59e66e7567a3d07c91f5ef15235f16c6 100644 (file)
--- a/Makefile
+++ b/Makefile
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