diff -r 56cda23f48d4 -r bb7a1f5a8b48 src/server/util/Makefile
--- a/src/server/util/Makefile	Mon Dec 31 00:07:52 2012 +0100
+++ b/src/server/util/Makefile	Tue Jan 01 13:32:04 2013 +0100
@@ -29,8 +29,8 @@
 UTIL_CFLAGS = -I/usr/include/mps -g
 
 $(UTIL_OBJPRE)%.o: util/%.c
-	cc -o $@ -c $(UTIL_CFLAGS) $(CFLAGS) $<
+	$(CC) -o $@ -c $(UTIL_CFLAGS) $(CFLAGS) $<
 
 $(UTIL_OBJPRE)%.o: util/%.cpp
-	CC -o $@ -c $(UTIL_CFLAGS) $(CFLAGS) $<
+	$(CXX) -o $@ -c $(UTIL_CFLAGS) $(CFLAGS) $<