diff --git a/make/defs.mk b/make/defs.mk
index 56a3a058..59fb9faf 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -45,6 +45,7 @@ endif
 OS                    ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh)
 
 CREATE_DEVEL          ?= true
+COMPILER_SUITE        ?= gcc
 
 ifeq ($(TARGET),mingw)
 FLAVOUR_PREFIX        ?= win32-
@@ -769,11 +770,16 @@ ifeq ($(USE_GFILTER),true)
 	endif
 endif
 
-ifeq "$(origin CC)" "default"
+ifeq "$(COMPILER_SUITE)" "gcc"
 CC                     = $(GCC)
 CPP                    = $(GPP)
 endif
 
+ifeq "$(COMPILER_SUITE)" "clang"
+CC                     = $(CLANG)
+CPP                    = $(CLANGPP)
+endif
+
 PROJECTLIB_LDFLAGS  += -L$(TOPDIR)/lib
 
 ifeq ($(USE_PROJECT_LIB),true)