diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2011-04-07 19:22:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-11 10:35:25 -0700 |
| commit | f228d1f006241e4085a432799356ebd7b1e86108 (patch) | |
| tree | d83f8275b69ada3bccc0c146b1bfe3cc82fdad45 /Makefile | |
| parent | ff46a49afadc92bf16ab1ec2dab6d31487de23cb (diff) | |
| download | git-f228d1f006241e4085a432799356ebd7b1e86108.tar.gz | |
Makefile: Use cgcc rather than sparse in the check target
cgcc is the recommended way to run sparse, since it provides
many -Defines suitable for the given gcc platform. Using an
"cgcc -no-compile" command runs sparse, with all the platform
specific definitions provided by cgcc, without also invoking
gcc.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -323,9 +323,7 @@ GCOV = gcov export TCL_PATH TCLTK_PATH -# sparse is architecture-neutral, which means that we need to tell it -# explicitly what architecture to check for. Fix this up for yours.. -SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ +SPARSE_FLAGS = @@ -924,6 +922,7 @@ ifeq ($(uname_O),Cygwin) X = .exe COMPAT_OBJS += compat/cygwin.o UNRELIABLE_FSTAT = UnfortunatelyYes + SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield endif ifeq ($(uname_S),FreeBSD) NEEDS_LIBICONV = YesPlease @@ -1177,6 +1176,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) EXTLIBS += -lws2_32 PTHREAD_LIBS = X = .exe + SPARSE_FLAGS = -Wno-one-bit-signed-bitfield ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) htmldir=doc/git/html/ prefix = @@ -2161,11 +2161,12 @@ check-sha1:: test-sha1$X ./test-sha1.sh check: common-cmds.h - if sparse; \ + @if sparse; \ then \ for i in $(patsubst %.o, %.c, $(GIT_OBJS)); \ do \ - sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; \ + echo ' ' SP $$i; \ + cgcc -no-compile $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; \ done; \ else \ echo 2>&1 "Did you mean 'make test'?"; \ |