--- Makefile.orig	2014-06-08 16:08:05.000000000 +0400
+++ Makefile	2014-06-12 17:44:20.000000000 +0400
@@ -54,21 +54,13 @@
 else
 CC?=gcc
 CXX?=g++
-LD=gcc
-LXX=g++
+LD=$(CC)
+LXX=$(CXX)
 AR=ar
 RANLIB=ranlib
 
-# this nice line comes from the linux kernel makefile
-BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
 OS=$(shell uname)
 
-ifeq ($(OS),FreeBSD)
-ARCH?=freebsd_$(BASE_ARCH)
-else
-ARCH?=$(BASE_ARCH)
-endif
-
 ifeq ($(ARCH),x86_64)
 BITS?=64
 else
@@ -246,10 +238,11 @@
 CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
 
 LDFLAGS_COMMON=$(LDFLAGS)
-LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
+LXXFLAGS_COMMON=$(LDFLAGS)#-lstdc++ -lsupc++ # disabled for Clang
 
 ifeq ($(OS),FreeBSD)
 LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm
+LXXFLAGS_COMMON+= -L$(LOCALBASE)/lib
 else
 LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm -ldl -O1 -Wl,--as-needed
 endif
@@ -357,12 +350,9 @@
 ######################################################################################################
 # Helper functions
 ######################################################################################################
-DO_CC=echo "  > Compiling $<" && \
-	$(CC) $(CFLAGS_COMMON) -c $< -o $@
-DO_CXX=echo "  > Compiling (c++) $<" && \
-	$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
-DO_RES=echo "  > Compiling resource $<" && \
-	$(RES) $(RESFLAGS_COMMON) -i $< -o $@
+DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@
+DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
+DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@
 
 DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
 DO_CC_DED=$(DO_CC) $(CFLAGS_DED)