The following commit has been merged in the master branch: commit 77217feb174263fd7229c5f70f56ff479eff7ce7 Author: Sven Eckelmann sven@narfation.org Date: Sat May 21 15:45:11 2011 +0200

vis: Only define CC when not already specified

It is possible that a build environment specifies the CC different than gcc (for example gcc-4.6). The Makefile should only set it when the compiler wasn't explicitely set.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/Makefile b/Makefile index 5cbff33..2817292 100755 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ ifndef V endif endif

-CC = gcc +CC ?= gcc CFLAGS += -pedantic -Wall -W -std=gnu99 EXTRA_CFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DREVISION_VERSION=$(REVISION_VERSION) LDFLAGS += -lpthread