diff --git a/waf-tools/cflags.py b/waf-tools/cflags.py
index 2e956954b..2bf919416 100644
--- a/waf-tools/cflags.py
+++ b/waf-tools/cflags.py
@@ -131,6 +131,8 @@ compiler_mapping = {
 	'msvc': msvc,
 	'icc': icc,
 	'icpc': icc,
+	'clang': gcc,
+	'clang++': gcc,
 }
 
 profiles = {